diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-03-29 09:44:16 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2011-03-29 09:47:08 +0200 |
| commit | c3698ea3e965cea74c039b8f8e4c968829f01dc0 (patch) | |
| tree | 6f3b72926f9dc785b9504175a8b6625b9c67f1c5 | |
| parent | 16d34d2c99ac8209ba0b085ad52b69bd1eb191d2 (diff) | |
Replace qtkernel with qtbase
90 files changed, 1306 insertions, 1306 deletions
@@ -44,7 +44,7 @@ push(@INC, "$basepath/scripts"); my $good_47_sha1 = '770d5468a87c84cc435eefaa2a234f8c3b87f8c2'; my $good_master_sha1 = '4da2ba2e788bb63a155e1d10ae559d4366eed875'; -our @repos = ('qtkernel', 'qtsvg', 'qtdeclarative', 'qt3support', 'activeqt', +our @repos = ('qtbase', 'qtsvg', 'qtdeclarative', 'qt3support', 'activeqt', 'qtscript', 'phonon', 'qtmultimedia', 'qttools', 'qtxmlpatterns', 'qttranslations', 'qtdoc', 'qlalr', 'devtools', 'qtwebkit-examples-and-demos', 'qtqa' @@ -254,7 +254,7 @@ sub findBranchVersion { my ($qtdir) = @_; my $qglobal = fileContents("$qtdir/src/corelib/global/qglobal.h"); - $qglobal = fileContents("$qtdir/qtkernel/src/corelib/global/qglobal.h") if (!$qglobal); + $qglobal = fileContents("$qtdir/qtbase/src/corelib/global/qglobal.h") if (!$qglobal); return "" if (!$qglobal); $qglobal =~ s/.*define\s+QT_VERSION_STR\s*\"([0-9\.]*)\".*/$1/s; return $qglobal; @@ -423,7 +423,7 @@ if ($rebase_patches) { # Modularize based on new HEAD, without patches run("git branch -f ${qtVersion}_mod"); - my $patch_start_sha1 = findSHA1Before($qtdir, "Some changes for qtkernel"); + my $patch_start_sha1 = findSHA1Before($qtdir, "Some changes for qtbase"); print "\n*** Good modularization branched ${qtVersion}_mod\n"; printf "*** Good patch series start at SHA1:%s\n", substr($patch_start_sha1, 0, 8); printf "*** Now modularizing SHA1:%s without patches\n\n", substr($new_sha1, 0, 8); @@ -453,7 +453,7 @@ if ($regenerate_patches) { } # Regenerate all patches - my $patchesSHA1 = findSHA1Before($qtdir, "Some changes for qtkernel"); + my $patchesSHA1 = findSHA1Before($qtdir, "Some changes for qtbase"); run("git --git-dir=$qtdir/.git format-patch -N $patchesSHA1"); # Report updated patches, and revert "no change" patches diff --git a/patches/0001-Some-changes-for-qtkernel.patch b/patches/0001-Some-changes-for-qtbase.patch index 6702ac0..cb1197d 100644 --- a/patches/0001-Some-changes-for-qtkernel.patch +++ b/patches/0001-Some-changes-for-qtbase.patch @@ -1,23 +1,23 @@ From 03460ee1c8b2b15806fa634b560622cd62ea4820 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Mon, 8 Nov 2010 20:09:10 -0600 -Subject: [PATCH] Some changes for qtkernel +Subject: [PATCH] Some changes for qtbase --- - qtkernel/bin/syncqt | 17 +----- - qtkernel/configure | 6 +- - qtkernel/qtkernel.pro | 32 +---------- - qtkernel/src/plugins/accessible/accessible.pro | 1 - - qtkernel/src/plugins/plugins.pro | 4 +- - qtkernel/src/src.pro | 75 +----------------------- - qtkernel/src/tools/tools.pro | 5 +- - qtkernel/tools/configure/configureapp.cpp | 2 +- + qtbase/bin/syncqt | 17 +----- + qtbase/configure | 6 +- + qtbase/qtbase.pro | 32 +---------- + qtbase/src/plugins/accessible/accessible.pro | 1 - + qtbase/src/plugins/plugins.pro | 4 +- + qtbase/src/src.pro | 75 +----------------------- + qtbase/src/tools/tools.pro | 5 +- + qtbase/tools/configure/configureapp.cpp | 2 +- 8 files changed, 11 insertions(+), 131 deletions(-) -diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt +diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt index 32b5384..9d5eece 100755 ---- a/qtkernel/bin/syncqt -+++ b/qtkernel/bin/syncqt +--- a/qtbase/bin/syncqt ++++ b/qtbase/bin/syncqt @@ -34,28 +34,13 @@ my %modules = ( # path to module name map "QtOpenVG" => "$basedir/src/openvg", "QtCore" => "$basedir/src/corelib", @@ -56,29 +56,29 @@ index 32b5384..9d5eece 100755 my %colliding_headers = (); my %inject_headers = ( "$basedir/src/corelib/global" => ( "qconfig.h" ) ); # all from build dir -diff --git a/qtkernel/configure b/qtkernel/configure +diff --git a/qtbase/configure b/qtbase/configure index e88373e..8a7de4e 100755 ---- a/qtkernel/configure -+++ b/qtkernel/configure +--- a/qtbase/configure ++++ b/qtbase/configure @@ -8754,11 +8754,11 @@ EXEC="" echo "Finding project files. Please wait..." if [ "$CFG_NOPROCESS" != "yes" ]; then - "$outpath/bin/qmake" -prl -r "${relpath}/projects.pro" - if [ -f "${relpath}/projects.pro" ]; then -+ "$outpath/bin/qmake" -prl -r "${relpath}/qtkernel.pro" -+ if [ -f "${relpath}/qtkernel.pro" ]; then ++ "$outpath/bin/qmake" -prl -r "${relpath}/qtbase.pro" ++ if [ -f "${relpath}/qtbase.pro" ]; then mkfile="${outpath}/Makefile" [ -f "$mkfile" ] && chmod +w "$mkfile" - QTDIR="$outpath" "$outpath/bin/qmake" -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile" -+ QTDIR="$outpath" "$outpath/bin/qmake" -spec "$XQMAKESPEC" "${relpath}/qtkernel.pro" -o "$mkfile" ++ QTDIR="$outpath" "$outpath/bin/qmake" -spec "$XQMAKESPEC" "${relpath}/qtbase.pro" -o "$mkfile" fi fi -diff --git a/qtkernel/qtkernel.pro b/qtkernel/qtkernel.pro +diff --git a/qtbase/qtbase.pro b/qtbase/qtbase.pro index 2e31e9a..05c745e 100644 ---- a/qtkernel/qtkernel.pro -+++ b/qtkernel/qtkernel.pro +--- a/qtbase/qtbase.pro ++++ b/qtbase/qtbase.pro @@ -7,30 +7,7 @@ TEMPLATE = subdirs cross_compile: CONFIG += nostrip @@ -122,20 +122,20 @@ index 2e31e9a..05c745e 100644 - INSTALLS += macdocs -} - -diff --git a/qtkernel/src/plugins/accessible/accessible.pro b/qtkernel/src/plugins/accessible/accessible.pro +diff --git a/qtbase/src/plugins/accessible/accessible.pro b/qtbase/src/plugins/accessible/accessible.pro index a7caf07..26c7d30 100644 ---- a/qtkernel/src/plugins/accessible/accessible.pro -+++ b/qtkernel/src/plugins/accessible/accessible.pro +--- a/qtbase/src/plugins/accessible/accessible.pro ++++ b/qtbase/src/plugins/accessible/accessible.pro @@ -2,5 +2,4 @@ TEMPLATE = subdirs contains(QT_CONFIG, accessibility) { SUBDIRS += widgets - contains(QT_CONFIG, qt3support):SUBDIRS += compat } -diff --git a/qtkernel/src/plugins/plugins.pro b/qtkernel/src/plugins/plugins.pro +diff --git a/qtbase/src/plugins/plugins.pro b/qtbase/src/plugins/plugins.pro index 7479d2f..d0d7188 100644 ---- a/qtkernel/src/plugins/plugins.pro -+++ b/qtkernel/src/plugins/plugins.pro +--- a/qtbase/src/plugins/plugins.pro ++++ b/qtbase/src/plugins/plugins.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs @@ -151,10 +151,10 @@ index 7479d2f..d0d7188 100644 -contains(QT_CONFIG, phonon): SUBDIRS *= phonon qpa:SUBDIRS += platforms -contains(QT_CONFIG, declarative): SUBDIRS *= qmltooling -diff --git a/qtkernel/src/src.pro b/qtkernel/src/src.pro +diff --git a/qtbase/src/src.pro b/qtbase/src/src.pro index 0908911..6da0877 100644 ---- a/qtkernel/src/src.pro -+++ b/qtkernel/src/src.pro +--- a/qtbase/src/src.pro ++++ b/qtbase/src/src.pro @@ -4,33 +4,19 @@ TEMPLATE = subdirs unset(SRC_SUBDIRS) win32:SRC_SUBDIRS += src_winmain @@ -187,7 +187,7 @@ index 0908911..6da0877 100644 -contains(QT_CONFIG, declarative):contains(QT_CONFIG, webkit): SRC_SUBDIRS += src_webkit_declarative -# s60installs need to be at the end, because projects.pro does an ordered build, -+# s60installs need to be at the end, because qtkernel.pro does an ordered build, ++# s60installs need to be at the end, because qtbase.pro does an ordered build, # and s60installs depends on all the others. symbian:SRC_SUBDIRS += src_s60installs @@ -296,10 +296,10 @@ index 0908911..6da0877 100644 } -diff --git a/qtkernel/src/tools/tools.pro b/qtkernel/src/tools/tools.pro +diff --git a/qtbase/src/tools/tools.pro b/qtbase/src/tools/tools.pro index 4736d09..ca42da6 100644 ---- a/qtkernel/src/tools/tools.pro -+++ b/qtkernel/src/tools/tools.pro +--- a/qtbase/src/tools/tools.pro ++++ b/qtbase/src/tools/tools.pro @@ -3,7 +3,6 @@ TEMPLATE = subdirs TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc !contains(QT_CONFIG, no-gui): TOOLS_SUBDIRS += src_tools_uic @@ -326,16 +326,16 @@ index 4736d09..ca42da6 100644 #debug debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) debug) -diff --git a/qtkernel/tools/configure/configureapp.cpp b/qtkernel/tools/configure/configureapp.cpp +diff --git a/qtbase/tools/configure/configureapp.cpp b/qtbase/tools/configure/configureapp.cpp index 4503235..b4f5e49 100644 ---- a/qtkernel/tools/configure/configureapp.cpp -+++ b/qtkernel/tools/configure/configureapp.cpp +--- a/qtbase/tools/configure/configureapp.cpp ++++ b/qtbase/tools/configure/configureapp.cpp @@ -3858,7 +3858,7 @@ void Configure::generateMakefiles() } // don't pass -spec - .qmake.cache has it already args << "-r"; - args << (sourcePath + "/projects.pro"); -+ args << (sourcePath + "/qtkernel.pro"); ++ args << (sourcePath + "/qtbase.pro"); args << "-o"; args << buildPath; if (!dictionary[ "QMAKEADDITIONALARGS" ].isEmpty()) diff --git a/patches/0003-Expose-source-and-build-directories-for-QtKernel.patch b/patches/0003-Expose-source-and-build-directories-for-QtBase.patch index 0ec3994..a89d5f8 100644 --- a/patches/0003-Expose-source-and-build-directories-for-QtKernel.patch +++ b/patches/0003-Expose-source-and-build-directories-for-QtBase.patch @@ -1,20 +1,20 @@ From 71b1d07fd40b2f0109cfc05c34f625c607321b96 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Thu, 11 Nov 2010 09:35:09 -0600 -Subject: [PATCH] Expose source and build directories for QtKernel +Subject: [PATCH] Expose source and build directories for QtBase Also expose moc, uic, rcc, qdbusxml2cpp, include and lib --- - qtkernel/configure | 69 ++++++++++++------- - qtkernel/mkspecs/features/qt_module.prf | 16 +++++ - qtkernel/tools/configure/configureapp.cpp | 106 +++++++++++++++++------------ + qtbase/configure | 69 ++++++++++++------- + qtbase/mkspecs/features/qt_module.prf | 16 +++++ + qtbase/tools/configure/configureapp.cpp | 106 +++++++++++++++++------------ 3 files changed, 121 insertions(+), 70 deletions(-) - create mode 100644 qtkernel/mkspecs/features/qt_module.prf + create mode 100644 qtbase/mkspecs/features/qt_module.prf -diff --git a/qtkernel/configure b/qtkernel/configure +diff --git a/qtbase/configure b/qtbase/configure index 8a7de4e..1a9c670 100755 ---- a/qtkernel/configure -+++ b/qtkernel/configure +--- a/qtbase/configure ++++ b/qtbase/configure @@ -8249,10 +8249,10 @@ else fi done @@ -159,19 +159,19 @@ index 8a7de4e..1a9c670 100755 # incrementals INCREMENTAL="" [ "$CFG_INCREMENTAL" = "auto" ] && "$WHICH" p4 >/dev/null 2>&1 && [ "$CFG_DEV" = "yes" ] && CFG_INCREMENTAL="yes" -diff --git a/qtkernel/mkspecs/features/qt_module.prf b/qtkernel/mkspecs/features/qt_module.prf +diff --git a/qtbase/mkspecs/features/qt_module.prf b/qtbase/mkspecs/features/qt_module.prf new file mode 100644 index 0000000..3ec941a --- /dev/null -+++ b/qtkernel/mkspecs/features/qt_module.prf ++++ b/qtbase/mkspecs/features/qt_module.prf @@ -0,0 +1,16 @@ +# This file is loaded on-demand, before any .qmake.cache (sometimes *in* .qmake.cache), to loaded -+# important settings for modules, such as paths to QtKernel and other modules. ++# important settings for modules, such as paths to QtBase and other modules. +# Consequently, we have to do some stunts to figure out where to find qmodule.pri. + +isEmpty(QMAKE_QT_MODULE)|!exists($$QMAKE_QT_MODULE) { + exists($$_QMAKE_CACHE_/mkspecs/qmodule.pri):QMAKE_QT_MODULE = $$_QMAKE_CACHE_/mkspecs/qmodule.pri -+ else:exists($$_QMAKE_CACHE_/qtkernel/mkspecs/qmodule.pri):QMAKE_QT_MODULE = $$_QMAKE_CACHE_/qtkernel/mkspecs/qmodule.pri ++ else:exists($$_QMAKE_CACHE_/qtbase/mkspecs/qmodule.pri):QMAKE_QT_MODULE = $$_QMAKE_CACHE_/qtbase/mkspecs/qmodule.pri + else:if(!isEmpty(QT_BUILD_TREE) & exists($$QT_BUILD_TREE/mkspecs/qmodule.pri)):QMAKE_QT_MODULE = $$QT_BUILD_TREE/mkspecs/qmodule.pri + else:exists($$[QT_INSTALL_DATA]/mkspecs/qmodule.pri):QMAKE_QT_MODULE = $$[QT_INSTALL_DATA]/mkspecs/qmodule.pri +} @@ -181,10 +181,10 @@ index 0000000..3ec941a +} else { + debug(1, "Loaded qmodule.pri from ($$QMAKE_QT_MODULE)") +} -diff --git a/qtkernel/tools/configure/configureapp.cpp b/qtkernel/tools/configure/configureapp.cpp +diff --git a/qtbase/tools/configure/configureapp.cpp b/qtbase/tools/configure/configureapp.cpp index b4f5e49..7aaa66c 100644 ---- a/qtkernel/tools/configure/configureapp.cpp -+++ b/qtkernel/tools/configure/configureapp.cpp +--- a/qtbase/tools/configure/configureapp.cpp ++++ b/qtbase/tools/configure/configureapp.cpp @@ -2913,63 +2913,101 @@ void Configure::generateCachefile() QFile cacheFile(buildPath + "/.qmake.cache"); if (cacheFile.open(QFile::WriteOnly | QFile::Text)) { // Truncates any existing file. diff --git a/patches/0005-Expose-private-support-for-separate-module-in-syncqt.patch b/patches/0005-Expose-private-support-for-separate-module-in-syncqt.patch index a4a5d31..8d42e28 100644 --- a/patches/0005-Expose-private-support-for-separate-module-in-syncqt.patch +++ b/patches/0005-Expose-private-support-for-separate-module-in-syncqt.patch @@ -4,13 +4,13 @@ Date: Mon, 15 Nov 2010 16:43:22 +0100 Subject: [PATCH] Expose private support for separate module in syncqt. --- - qtkernel/bin/syncqt | 5 ++++- + qtbase/bin/syncqt | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) -diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt +diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt index 9d5eece..b8162d2 100755 ---- a/qtkernel/bin/syncqt -+++ b/qtkernel/bin/syncqt +--- a/qtbase/bin/syncqt ++++ b/qtbase/bin/syncqt @@ -82,6 +82,7 @@ sub showUsage print " -outdir <PATH> Specify output directory for sync (default: $out_basedir)\n"; print " -quiet Only report problems, not activity (default: " . ($quiet ? "yes" : "no") . ")\n"; diff --git a/patches/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch b/patches/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch index 97356bc..234a691 100644 --- a/patches/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch +++ b/patches/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch @@ -4,19 +4,19 @@ Date: Mon, 15 Nov 2010 13:55:17 -0600 Subject: [PATCH] Make syncqt use sync.profile files from each module The sync.profile replaces the hardcoded paths inside syncqt, and -enables it to work for other modules than just qtkernel. +enables it to work for other modules than just qtbase. --- - qtkernel/bin/syncqt | 163 +++++++++++++++-------------- - qtkernel/configure | 3 +- - qtkernel/sync.profile | 44 ++++++++ - qtkernel/tools/configure/configureapp.cpp | 4 +- + qtbase/bin/syncqt | 163 +++++++++++++++-------------- + qtbase/configure | 3 +- + qtbase/sync.profile | 44 ++++++++ + qtbase/tools/configure/configureapp.cpp | 4 +- 4 files changed, 130 insertions(+), 84 deletions(-) - create mode 100644 qtkernel/sync.profile + create mode 100644 qtbase/sync.profile -diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt +diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt index b8162d2..7e5fc44 100755 ---- a/qtkernel/bin/syncqt -+++ b/qtkernel/bin/syncqt +--- a/qtbase/bin/syncqt ++++ b/qtbase/bin/syncqt @@ -12,40 +12,22 @@ use File::Basename; use File::Path; @@ -250,10 +250,10 @@ index b8162d2..7e5fc44 100755 } } } -diff --git a/qtkernel/configure b/qtkernel/configure +diff --git a/qtbase/configure b/qtbase/configure index 1a9c670..c6cef4e 100755 ---- a/qtkernel/configure -+++ b/qtkernel/configure +--- a/qtbase/configure ++++ b/qtbase/configure @@ -2539,8 +2539,7 @@ if [ "$OPT_SHADOW" = "yes" ]; then if [ -x "$relpath/bin/syncqt" ]; then mkdir -p "$outpath/bin" @@ -264,11 +264,11 @@ index 1a9c670..c6cef4e 100755 chmod 755 "$outpath/bin/syncqt" fi -diff --git a/qtkernel/sync.profile b/qtkernel/sync.profile +diff --git a/qtbase/sync.profile b/qtbase/sync.profile new file mode 100644 index 0000000..7d2e4b1 --- /dev/null -+++ b/qtkernel/sync.profile ++++ b/qtbase/sync.profile @@ -0,0 +1,44 @@ +%modules = ( # path to module name map + "QtGui" => "$basedir/src/gui", @@ -314,10 +314,10 @@ index 0000000..7d2e4b1 +@ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qt_windows.h" ); +@ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h" ); +@ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtTest}", "$modules{QtDBus}" ); -diff --git a/qtkernel/tools/configure/configureapp.cpp b/qtkernel/tools/configure/configureapp.cpp +diff --git a/qtbase/tools/configure/configureapp.cpp b/qtbase/tools/configure/configureapp.cpp index 7aaa66c..bf0925e 100644 ---- a/qtkernel/tools/configure/configureapp.cpp -+++ b/qtkernel/tools/configure/configureapp.cpp +--- a/qtbase/tools/configure/configureapp.cpp ++++ b/qtbase/tools/configure/configureapp.cpp @@ -188,9 +188,7 @@ Configure::Configure(int& argc, char** argv) if (syncqt_bat.open(QFile::WriteOnly)) { QTextStream stream(&syncqt_bat); diff --git a/patches/0008-Moved-symbianpkgrules-profiles-to-be-feature-profile.patch b/patches/0008-Moved-symbianpkgrules-profiles-to-be-feature-profile.patch index 8182879..d527fb2 100644 --- a/patches/0008-Moved-symbianpkgrules-profiles-to-be-feature-profile.patch +++ b/patches/0008-Moved-symbianpkgrules-profiles-to-be-feature-profile.patch @@ -7,29 +7,29 @@ Subject: [PATCH] Moved symbianpkgrules profiles to be feature profiles. .../features/symbian/qt_demo.prf} | 2 -- .../features/symbian/qt_example.prf} | 3 --- 2 files changed, 0 insertions(+), 5 deletions(-) - rename qtkernel/{demos/symbianpkgrules.pri => mkspecs/features/symbian/qt_demo.prf} (88%) - rename qtkernel/{examples/symbianpkgrules.pri => mkspecs/features/symbian/qt_example.prf} (88%) + rename qtbase/{demos/symbianpkgrules.pri => mkspecs/features/symbian/qt_demo.prf} (88%) + rename qtbase/{examples/symbianpkgrules.pri => mkspecs/features/symbian/qt_example.prf} (88%) -diff --git a/qtkernel/demos/symbianpkgrules.pri b/qtkernel/mkspecs/features/symbian/qt_demo.prf +diff --git a/qtbase/demos/symbianpkgrules.pri b/qtbase/mkspecs/features/symbian/qt_demo.prf similarity index 88% -rename from qtkernel/demos/symbianpkgrules.pri -rename to qtkernel/mkspecs/features/symbian/qt_demo.prf +rename from qtbase/demos/symbianpkgrules.pri +rename to qtbase/mkspecs/features/symbian/qt_demo.prf index ef6dfd8..9c4d96c 100644 ---- a/qtkernel/demos/symbianpkgrules.pri -+++ b/qtkernel/mkspecs/features/symbian/qt_demo.prf +--- a/qtbase/demos/symbianpkgrules.pri ++++ b/qtbase/mkspecs/features/symbian/qt_demo.prf @@ -1,5 +1,3 @@ -!symbian: error(Only include this file for Symbian platforms) - RSS_RULES ="group_name=\"QtDemos\";" nokiaVendor = "Nokia, Qt" -diff --git a/qtkernel/examples/symbianpkgrules.pri b/qtkernel/mkspecs/features/symbian/qt_example.prf +diff --git a/qtbase/examples/symbianpkgrules.pri b/qtbase/mkspecs/features/symbian/qt_example.prf similarity index 88% -rename from qtkernel/examples/symbianpkgrules.pri -rename to qtkernel/mkspecs/features/symbian/qt_example.prf +rename from qtbase/examples/symbianpkgrules.pri +rename to qtbase/mkspecs/features/symbian/qt_example.prf index fe9b487..8c523fb 100644 ---- a/qtkernel/examples/symbianpkgrules.pri -+++ b/qtkernel/mkspecs/features/symbian/qt_example.prf +--- a/qtbase/examples/symbianpkgrules.pri ++++ b/qtbase/mkspecs/features/symbian/qt_example.prf @@ -1,5 +1,3 @@ -!symbian: error(Only include this file for Symbian platforms) - diff --git a/patches/0011-Fixup-not-paths-for-other-modules.patch b/patches/0011-Fixup-not-paths-for-other-modules.patch index ee8b327..c9f9aad 100644 --- a/patches/0011-Fixup-not-paths-for-other-modules.patch +++ b/patches/0011-Fixup-not-paths-for-other-modules.patch @@ -4,17 +4,17 @@ Date: Wed, 24 Nov 2010 19:51:35 -0600 Subject: [PATCH] Fixup: not paths for other modules --- - qtkernel/mkspecs/features/qt_module.prf | 2 +- + qtbase/mkspecs/features/qt_module.prf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -diff --git a/qtkernel/mkspecs/features/qt_module.prf b/qtkernel/mkspecs/features/qt_module.prf +diff --git a/qtbase/mkspecs/features/qt_module.prf b/qtbase/mkspecs/features/qt_module.prf index 3ec941a..dbe863f 100644 ---- a/qtkernel/mkspecs/features/qt_module.prf -+++ b/qtkernel/mkspecs/features/qt_module.prf +--- a/qtbase/mkspecs/features/qt_module.prf ++++ b/qtbase/mkspecs/features/qt_module.prf @@ -1,5 +1,5 @@ # This file is loaded on-demand, before any .qmake.cache (sometimes *in* .qmake.cache), to loaded --# important settings for modules, such as paths to QtKernel and other modules. -+# important settings for modules, such as paths to QtKernel, settings etc. +-# important settings for modules, such as paths to QtBase and other modules. ++# important settings for modules, such as paths to QtBase, settings etc. # Consequently, we have to do some stunts to figure out where to find qmodule.pri. isEmpty(QMAKE_QT_MODULE)|!exists($$QMAKE_QT_MODULE) { diff --git a/patches/0012-Have-qmake-run-syncqt-automatically-if-sync.profile-.patch b/patches/0012-Have-qmake-run-syncqt-automatically-if-sync.profile-.patch index 86e1d74..cfe6ea5 100644 --- a/patches/0012-Have-qmake-run-syncqt-automatically-if-sync.profile-.patch +++ b/patches/0012-Have-qmake-run-syncqt-automatically-if-sync.profile-.patch @@ -8,13 +8,13 @@ and syncqt is smart enough to not touch already existing files. And in edition, syncqt uses the original file's timestamp on the fwding files. --- - qtkernel/mkspecs/features/default_pre.prf | 28 ++++++++++++++++++++++++++++ + qtbase/mkspecs/features/default_pre.prf | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) -diff --git a/qtkernel/mkspecs/features/default_pre.prf b/qtkernel/mkspecs/features/default_pre.prf +diff --git a/qtbase/mkspecs/features/default_pre.prf b/qtbase/mkspecs/features/default_pre.prf index 2e82f03..b8779c8 100644 ---- a/qtkernel/mkspecs/features/default_pre.prf -+++ b/qtkernel/mkspecs/features/default_pre.prf +--- a/qtbase/mkspecs/features/default_pre.prf ++++ b/qtbase/mkspecs/features/default_pre.prf @@ -1,3 +1,31 @@ load(exclusive_builds) ### Qt 5: remove "uic" and "resources" - or add "qt" diff --git a/patches/0013-Add-module-specific-pris-and-make-syncqt-create-fwd-.patch b/patches/0013-Add-module-specific-pris-and-make-syncqt-create-fwd-.patch index 6f19175..2816062 100644 --- a/patches/0013-Add-module-specific-pris-and-make-syncqt-create-fwd-.patch +++ b/patches/0013-Add-module-specific-pris-and-make-syncqt-create-fwd-.patch @@ -11,7 +11,7 @@ The module specific pris define the modules lib paths additional CONFIGs and DEFINES They are located in the modules source directory, with fwd -includes created in QtKernel/mkspecs/modules build directory. +includes created in QtBase/mkspecs/modules build directory. The pris use QT_MODULE_INCLUDE_BASE QT_MODULE_LIB_BASE @@ -22,51 +22,51 @@ are normally based on for installed modules, but overridden to the module's build directory by syncqt for the fwd included pris. The path of the pris must be specified in the sync.profile -for syncqt to create the fwding pris in QtKernel. +for syncqt to create the fwding pris in QtBase. --- - qtkernel/bin/syncqt | 59 ++++++++++++++++++++++++++++-- - qtkernel/mkspecs/features/qt_config.prf | 9 ++++- - qtkernel/src/modules/qt_core.pri | 11 ++++++ - qtkernel/src/modules/qt_dbus.pri | 12 ++++++ - qtkernel/src/modules/qt_gui.pri | 11 ++++++ - qtkernel/src/modules/qt_network.pri | 11 ++++++ - qtkernel/src/modules/qt_opengl.pri | 12 ++++++ - qtkernel/src/modules/qt_openvg.pri | 12 ++++++ - qtkernel/src/modules/qt_sql.pri | 11 ++++++ - qtkernel/src/modules/qt_svg.pri | 11 ++++++ - qtkernel/src/modules/qt_testlib.pri | 12 ++++++ - qtkernel/src/modules/qt_xml.pri | 11 ++++++ - qtkernel/sync.profile | 13 +++++++ + qtbase/bin/syncqt | 59 ++++++++++++++++++++++++++++-- + qtbase/mkspecs/features/qt_config.prf | 9 ++++- + qtbase/src/modules/qt_core.pri | 11 ++++++ + qtbase/src/modules/qt_dbus.pri | 12 ++++++ + qtbase/src/modules/qt_gui.pri | 11 ++++++ + qtbase/src/modules/qt_network.pri | 11 ++++++ + qtbase/src/modules/qt_opengl.pri | 12 ++++++ + qtbase/src/modules/qt_openvg.pri | 12 ++++++ + qtbase/src/modules/qt_sql.pri | 11 ++++++ + qtbase/src/modules/qt_svg.pri | 11 ++++++ + qtbase/src/modules/qt_testlib.pri | 12 ++++++ + qtbase/src/modules/qt_xml.pri | 11 ++++++ + qtbase/sync.profile | 13 +++++++ qtxmlpatterns/modules/qt_xmlpatterns.pri | 11 ++++++ qtxmlpatterns/sync.profile | 3 ++ 15 files changed, 205 insertions(+), 4 deletions(-) - create mode 100644 qtkernel/src/modules/qt_core.pri - create mode 100644 qtkernel/src/modules/qt_dbus.pri - create mode 100644 qtkernel/src/modules/qt_gui.pri - create mode 100644 qtkernel/src/modules/qt_network.pri - create mode 100644 qtkernel/src/modules/qt_opengl.pri - create mode 100644 qtkernel/src/modules/qt_openvg.pri - create mode 100644 qtkernel/src/modules/qt_sql.pri - create mode 100644 qtkernel/src/modules/qt_svg.pri - create mode 100644 qtkernel/src/modules/qt_testlib.pri - create mode 100644 qtkernel/src/modules/qt_xml.pri + create mode 100644 qtbase/src/modules/qt_core.pri + create mode 100644 qtbase/src/modules/qt_dbus.pri + create mode 100644 qtbase/src/modules/qt_gui.pri + create mode 100644 qtbase/src/modules/qt_network.pri + create mode 100644 qtbase/src/modules/qt_opengl.pri + create mode 100644 qtbase/src/modules/qt_openvg.pri + create mode 100644 qtbase/src/modules/qt_sql.pri + create mode 100644 qtbase/src/modules/qt_svg.pri + create mode 100644 qtbase/src/modules/qt_testlib.pri + create mode 100644 qtbase/src/modules/qt_xml.pri create mode 100644 qtxmlpatterns/modules/qt_xmlpatterns.pri -diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt +diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt index 7e5fc44..bceab27 100755 ---- a/qtkernel/bin/syncqt -+++ b/qtkernel/bin/syncqt +--- a/qtbase/bin/syncqt ++++ b/qtbase/bin/syncqt @@ -23,8 +23,16 @@ our $basedir; our $quoted_basedir; -+# try to figure out where QtKernel is located ++# try to figure out where QtBase is located +# normally the script location should be enough, if not fall back to +# QTDIR environment variable. If that doesn't work, later ask the +# user to use the -qtdir option explicitly. -+my $qtkerneldir = dirname(dirname($0)); -+$qtkerneldir = $ENV{"QTDIR"} if ($qtkerneldir !~ /qtkernel/); -+$qtkerneldir =~ s=\\=/=g if (defined $qtkerneldir); ++my $qtbasedir = dirname(dirname($0)); ++$qtbasedir = $ENV{"QTDIR"} if ($qtbasedir !~ /qtbase/); ++$qtbasedir =~ s=\\=/=g if (defined $qtbasedir); + # will be defined based on the modules sync.profile -our (%modules, %moduleheaders, %classnames, %mastercontent); @@ -86,7 +86,7 @@ index 7e5fc44..bceab27 100755 print " -windows Force platform to Windows (default: " . ($force_win ? "yes" : "no") . ")\n"; print " -showonly Show action but not perform (default: " . ($showonly ? "yes" : "no") . ")\n"; print " -outdir <PATH> Specify output directory for sync (default: $out_basedir)\n"; -+ print " -qtdir <PATH> Set the path to QtKernel (detected: " . (defined $qtkerneldir ? $qtkerneldir : "-none-") . ")\n"; ++ print " -qtdir <PATH> Set the path to QtBase (detected: " . (defined $qtbasedir ? $qtbasedir : "-none-") . ")\n"; print " -quiet Only report problems, not activity (default: " . ($quiet ? "yes" : "no") . ")\n"; - print " -separate-module <NAME>:<PROFILEDIR>:<HEADERDIR> Create headers for <NAME> with original headers in <HEADERDIR> relative to <PROFILEDIR> \n"; + print " -separate-module <NAME>:<PROFILEDIR>:<HEADERDIR>\n"; @@ -128,8 +128,8 @@ index 7e5fc44..bceab27 100755 $create_uic_class_map = 0; + } elsif ($var eq "qtdir") { + if($val) { -+ $qtkerneldir = $val; -+ $qtkerneldir =~ s=\\=/=g; ++ $qtbasedir = $val; ++ $qtbasedir =~ s=\\=/=g; + } else { + die "The -qtdir option requires an argument"; + } @@ -142,14 +142,14 @@ index 7e5fc44..bceab27 100755 } } -+# if the $qtkerneldir neither has 'qtkernel' somewhere in its path, nor a ++# if the $qtbasedir neither has 'qtbase' somewhere in its path, nor a +# '.qmake.cache' file in its directory, we assume it's not a valid path -+# (remember that a yet-to-be-built qtkernel doesn't have this file either, -+# thus the 'qtkernel' path check!) -+die "Cannot automatically detect/use provided path to QtKernel's build directory!\n" . -+ "QTDIR detected/provided: " . (defined $qtkerneldir ? $qtkerneldir : "-none-") . "\n" . ++# (remember that a yet-to-be-built qtbase doesn't have this file either, ++# thus the 'qtbase' path check!) ++die "Cannot automatically detect/use provided path to QtBase's build directory!\n" . ++ "QTDIR detected/provided: " . (defined $qtbasedir ? $qtbasedir : "-none-") . "\n" . + "Please -qtdir option to provide the correct path.\nsyncqt failed" -+ if (!defined $qtkerneldir || (!-e "$qtkerneldir/.qmake.cache" && $qtkerneldir !~ /qtkernel/)); ++ if (!defined $qtbasedir || (!-e "$qtbasedir/.qmake.cache" && $qtbasedir !~ /qtbase/)); + # if we have no $basedir we cannot be sure which sources you want, so die die "Could not find any sync.profile for your module!\nPass <module directory> to syncqt to sync your header files.\nsyncqt failed" if (!$basedir); @@ -159,12 +159,12 @@ index 7e5fc44..bceab27 100755 close HEADERS_PRI_FILE; } + -+ # create forwarding module pri in qtkernel/mkspecs/modules ++ # create forwarding module pri in qtbase/mkspecs/modules + unless ($no_module_fwd) { + my $modulepri = $modulepris{$lib}; + if (-e $modulepri) { + my $modulepriname = basename($modulepri); -+ my $moduleprifwd = "$qtkerneldir/mkspecs/modules/$modulepriname"; ++ my $moduleprifwd = "$qtbasedir/mkspecs/modules/$modulepriname"; + open MODULE_PRI_FILE, ">$moduleprifwd"; + print MODULE_PRI_FILE "QT_MODULE_INCLUDE_BASE = $out_basedir/include\n"; + print MODULE_PRI_FILE "QT_MODULE_LIB_BASE = $out_basedir/lib\n"; @@ -178,10 +178,10 @@ index 7e5fc44..bceab27 100755 } } unless($showonly || !$create_uic_class_map) { -diff --git a/qtkernel/mkspecs/features/qt_config.prf b/qtkernel/mkspecs/features/qt_config.prf +diff --git a/qtbase/mkspecs/features/qt_config.prf b/qtbase/mkspecs/features/qt_config.prf index de1cac4..2973c7e 100644 ---- a/qtkernel/mkspecs/features/qt_config.prf -+++ b/qtkernel/mkspecs/features/qt_config.prf +--- a/qtbase/mkspecs/features/qt_config.prf ++++ b/qtbase/mkspecs/features/qt_config.prf @@ -14,7 +14,14 @@ isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) { for(dir, $$list($$unique($$list($$dirname(QMAKE_QT_CONFIG) \ $$split($$list($$[QMAKE_MKSPECS]), $$DIRLIST_SEPARATOR))))) { @@ -198,11 +198,11 @@ index de1cac4..2973c7e 100644 } } -diff --git a/qtkernel/src/modules/qt_core.pri b/qtkernel/src/modules/qt_core.pri +diff --git a/qtbase/src/modules/qt_core.pri b/qtbase/src/modules/qt_core.pri new file mode 100644 index 0000000..742aefe --- /dev/null -+++ b/qtkernel/src/modules/qt_core.pri ++++ b/qtbase/src/modules/qt_core.pri @@ -0,0 +1,11 @@ +QT_CORE_VERSION = $$QT_VERSION +QT_CORE_MAJOR_VERSION = $$QT_MAJOR_VERSION @@ -215,11 +215,11 @@ index 0000000..742aefe +QT.core.depends = + +QT_CONFIG += core -diff --git a/qtkernel/src/modules/qt_dbus.pri b/qtkernel/src/modules/qt_dbus.pri +diff --git a/qtbase/src/modules/qt_dbus.pri b/qtbase/src/modules/qt_dbus.pri new file mode 100644 index 0000000..fddcbf7 --- /dev/null -+++ b/qtkernel/src/modules/qt_dbus.pri ++++ b/qtbase/src/modules/qt_dbus.pri @@ -0,0 +1,12 @@ +QT_DBUS_VERSION = $$QT_VERSION +QT_DBUS_MAJOR_VERSION = $$QT_MAJOR_VERSION @@ -233,11 +233,11 @@ index 0000000..fddcbf7 +QT.dbus.CONFIG = dbusadaptors dbusinterfaces + +QT_CONFIG += dbus -diff --git a/qtkernel/src/modules/qt_gui.pri b/qtkernel/src/modules/qt_gui.pri +diff --git a/qtbase/src/modules/qt_gui.pri b/qtbase/src/modules/qt_gui.pri new file mode 100644 index 0000000..6da7431 --- /dev/null -+++ b/qtkernel/src/modules/qt_gui.pri ++++ b/qtbase/src/modules/qt_gui.pri @@ -0,0 +1,11 @@ +QT_GUI_VERSION = $$QT_VERSION +QT_GUI_MAJOR_VERSION = $$QT_MAJOR_VERSION @@ -250,11 +250,11 @@ index 0000000..6da7431 +QT.gui.depends = core network + +QT_CONFIG += gui -diff --git a/qtkernel/src/modules/qt_network.pri b/qtkernel/src/modules/qt_network.pri +diff --git a/qtbase/src/modules/qt_network.pri b/qtbase/src/modules/qt_network.pri new file mode 100644 index 0000000..4d32079 --- /dev/null -+++ b/qtkernel/src/modules/qt_network.pri ++++ b/qtbase/src/modules/qt_network.pri @@ -0,0 +1,11 @@ +QT_CORE_VERSION = $$QT_VERSION +QT_NETWORK_MAJOR_VERSION = $$QT_MAJOR_VERSION @@ -267,11 +267,11 @@ index 0000000..4d32079 +QT.network.depends = core + +QT_CONFIG += network -diff --git a/qtkernel/src/modules/qt_opengl.pri b/qtkernel/src/modules/qt_opengl.pri +diff --git a/qtbase/src/modules/qt_opengl.pri b/qtbase/src/modules/qt_opengl.pri new file mode 100644 index 0000000..9ad1425 --- /dev/null -+++ b/qtkernel/src/modules/qt_opengl.pri ++++ b/qtbase/src/modules/qt_opengl.pri @@ -0,0 +1,12 @@ +QT_OPENGL_VERSION = $$QT_VERSION +QT_OPENGL_MAJOR_VERSION = $$QT_MAJOR_VERSION @@ -285,11 +285,11 @@ index 0000000..9ad1425 +QT.opengl.CONFIG = opengl + +QT_CONFIG += opengl -diff --git a/qtkernel/src/modules/qt_openvg.pri b/qtkernel/src/modules/qt_openvg.pri +diff --git a/qtbase/src/modules/qt_openvg.pri b/qtbase/src/modules/qt_openvg.pri new file mode 100644 index 0000000..612bd13 --- /dev/null -+++ b/qtkernel/src/modules/qt_openvg.pri ++++ b/qtbase/src/modules/qt_openvg.pri @@ -0,0 +1,12 @@ +QT_OPENVG_VERSION = $$QT_VERSION +QT_OPENVG_MAJOR_VERSION = $$QT_MAJOR_VERSION @@ -303,11 +303,11 @@ index 0000000..612bd13 +QT.openvg.CONFIG = openvg + +QT_CONFIG += openvg -diff --git a/qtkernel/src/modules/qt_sql.pri b/qtkernel/src/modules/qt_sql.pri +diff --git a/qtbase/src/modules/qt_sql.pri b/qtbase/src/modules/qt_sql.pri new file mode 100644 index 0000000..bf5917b --- /dev/null -+++ b/qtkernel/src/modules/qt_sql.pri ++++ b/qtbase/src/modules/qt_sql.pri @@ -0,0 +1,11 @@ +QT_SQL_VERSION = $$QT_VERSION +QT_SQL_MAJOR_VERSION = $$QT_MAJOR_VERSION @@ -320,11 +320,11 @@ index 0000000..bf5917b +QT.sql.depends = core + +QT_CONFIG += sql -diff --git a/qtkernel/src/modules/qt_svg.pri b/qtkernel/src/modules/qt_svg.pri +diff --git a/qtbase/src/modules/qt_svg.pri b/qtbase/src/modules/qt_svg.pri new file mode 100644 index 0000000..faccb78 --- /dev/null -+++ b/qtkernel/src/modules/qt_svg.pri ++++ b/qtbase/src/modules/qt_svg.pri @@ -0,0 +1,11 @@ +QT_SVG_VERSION = $$QT_VERSION +QT_SVG_MAJOR_VERSION = $$QT_MAJOR_VERSION @@ -337,11 +337,11 @@ index 0000000..faccb78 +QT.svg.depends = core gui + +QT_CONFIG += svg -diff --git a/qtkernel/src/modules/qt_testlib.pri b/qtkernel/src/modules/qt_testlib.pri +diff --git a/qtbase/src/modules/qt_testlib.pri b/qtbase/src/modules/qt_testlib.pri new file mode 100644 index 0000000..0f65438 --- /dev/null -+++ b/qtkernel/src/modules/qt_testlib.pri ++++ b/qtbase/src/modules/qt_testlib.pri @@ -0,0 +1,12 @@ +QT_TEST_VERSION = $$QT_VERSION +QT_TEST_MAJOR_VERSION = $$QT_MAJOR_VERSION @@ -355,11 +355,11 @@ index 0000000..0f65438 +QT.testlib.CONFIG = console + +QT_CONFIG += testlib -diff --git a/qtkernel/src/modules/qt_xml.pri b/qtkernel/src/modules/qt_xml.pri +diff --git a/qtbase/src/modules/qt_xml.pri b/qtbase/src/modules/qt_xml.pri new file mode 100644 index 0000000..45dbc667 --- /dev/null -+++ b/qtkernel/src/modules/qt_xml.pri ++++ b/qtbase/src/modules/qt_xml.pri @@ -0,0 +1,11 @@ +QT_XML_VERSION = $$QT_VERSION +QT_XML_MAJOR_VERSION = $$QT_MAJOR_VERSION @@ -372,10 +372,10 @@ index 0000000..45dbc667 +QT.xml.depends = core + +QT_CONFIG += xml -diff --git a/qtkernel/sync.profile b/qtkernel/sync.profile +diff --git a/qtbase/sync.profile b/qtbase/sync.profile index 7d2e4b1..c8ef4fc 100644 ---- a/qtkernel/sync.profile -+++ b/qtkernel/sync.profile +--- a/qtbase/sync.profile ++++ b/qtbase/sync.profile @@ -37,6 +37,19 @@ "openvg" => "#include <QtOpenVG/QtOpenVG>\n", "xml" => "#include <QtXml/QtXml>\n", diff --git a/patches/0014-Add-resolve_depends-var-prefix-function-to-qmake.patch b/patches/0014-Add-resolve_depends-var-prefix-function-to-qmake.patch index 9008fb1..27814ad 100644 --- a/patches/0014-Add-resolve_depends-var-prefix-function-to-qmake.patch +++ b/patches/0014-Add-resolve_depends-var-prefix-function-to-qmake.patch @@ -15,14 +15,14 @@ Due to the recursive nature of the algorithm it was just much easier to implement it directly in C++ rather than in a qmake-language function. --- - qtkernel/qmake/project.cpp | 46 +++++++++++++++++++++++++++++++++++++++++++- - qtkernel/qmake/project.h | 1 + + qtbase/qmake/project.cpp | 46 +++++++++++++++++++++++++++++++++++++++++++- + qtbase/qmake/project.h | 1 + 2 files changed, 46 insertions(+), 1 deletions(-) -diff --git a/qtkernel/qmake/project.cpp b/qtkernel/qmake/project.cpp +diff --git a/qtbase/qmake/project.cpp b/qtbase/qmake/project.cpp index 815f210..c461d33 100644 ---- a/qtkernel/qmake/project.cpp -+++ b/qtkernel/qmake/project.cpp +--- a/qtbase/qmake/project.cpp ++++ b/qtbase/qmake/project.cpp @@ -81,7 +81,7 @@ enum ExpandFunc { E_MEMBER=1, E_FIRST, E_LAST, E_CAT, E_FROMFILE, E_EVAL, E_LIST E_SPRINTF, E_JOIN, E_SPLIT, E_BASENAME, E_DIRNAME, E_SECTION, E_FIND, E_SYSTEM, E_UNIQUE, E_QUOTE, E_ESCAPE_EXPAND, @@ -97,10 +97,10 @@ index 815f210..c461d33 100644 default: { fprintf(stderr, "%s:%d: Unknown replace function: %s\n", parser.file.toLatin1().constData(), parser.line_no, -diff --git a/qtkernel/qmake/project.h b/qtkernel/qmake/project.h +diff --git a/qtbase/qmake/project.h b/qtbase/qmake/project.h index 09aa45e..66e48cd 100644 ---- a/qtkernel/qmake/project.h -+++ b/qtkernel/qmake/project.h +--- a/qtbase/qmake/project.h ++++ b/qtbase/qmake/project.h @@ -107,6 +107,7 @@ class QMakeProject QStringList doVariableReplaceExpand(const QString &str, QMap<QString, QStringList> &place, bool *ok=0); void init(QMakeProperty *, const QMap<QString, QStringList> *); diff --git a/patches/0015-Make-qt.prf-use-new-qt_module.pri-structure-for-QT-v.patch b/patches/0015-Make-qt.prf-use-new-qt_module.pri-structure-for-QT-v.patch index 4719720..9d3fe3a 100644 --- a/patches/0015-Make-qt.prf-use-new-qt_module.pri-structure-for-QT-v.patch +++ b/patches/0015-Make-qt.prf-use-new-qt_module.pri-structure-for-QT-v.patch @@ -5,15 +5,15 @@ Subject: [PATCH] Make qt.prf use new qt_module.pri structure for QT variable This change requires the new resolve_depends(var, prefix) function in qmake. --- - qtkernel/mkspecs/features/qt.prf | 87 +++++---------------------- - qtkernel/mkspecs/features/qt_functions.prf | 63 ++++++++++++++++++++ - qtkernel/src/qbase.pri | 4 +- + qtbase/mkspecs/features/qt.prf | 87 +++++---------------------- + qtbase/mkspecs/features/qt_functions.prf | 63 ++++++++++++++++++++ + qtbase/src/qbase.pri | 4 +- 3 files changed, 82 insertions(+), 72 deletions(-) -diff --git a/qtkernel/mkspecs/features/qt.prf b/qtkernel/mkspecs/features/qt.prf +diff --git a/qtbase/mkspecs/features/qt.prf b/qtbase/mkspecs/features/qt.prf index 191a449..4d8e465 100644 ---- a/qtkernel/mkspecs/features/qt.prf -+++ b/qtkernel/mkspecs/features/qt.prf +--- a/qtbase/mkspecs/features/qt.prf ++++ b/qtbase/mkspecs/features/qt.prf @@ -35,19 +35,6 @@ plugin { #Qt plugins INCLUDEPATH = $$QMAKE_INCDIR_QT $$INCLUDEPATH #prepending prevents us from picking up "stale" includes win32:INCLUDEPATH += $$QMAKE_INCDIR_QT/ActiveQt @@ -120,10 +120,10 @@ index 191a449..4d8e465 100644 } qt_compat { -diff --git a/qtkernel/mkspecs/features/qt_functions.prf b/qtkernel/mkspecs/features/qt_functions.prf +diff --git a/qtbase/mkspecs/features/qt_functions.prf b/qtbase/mkspecs/features/qt_functions.prf index 1fb6298..9182f87 100644 ---- a/qtkernel/mkspecs/features/qt_functions.prf -+++ b/qtkernel/mkspecs/features/qt_functions.prf +--- a/qtbase/mkspecs/features/qt_functions.prf ++++ b/qtbase/mkspecs/features/qt_functions.prf @@ -92,6 +92,69 @@ defineTest(qtAddLibrary) { return(true) } @@ -194,10 +194,10 @@ index 1fb6298..9182f87 100644 # variable, default defineTest(qtPrepareTool) { isEmpty($$1) { -diff --git a/qtkernel/src/qbase.pri b/qtkernel/src/qbase.pri +diff --git a/qtbase/src/qbase.pri b/qtbase/src/qbase.pri index 4d835bd..08f4758 100644 ---- a/qtkernel/src/qbase.pri -+++ b/qtkernel/src/qbase.pri +--- a/qtbase/src/qbase.pri ++++ b/qtbase/src/qbase.pri @@ -1,5 +1,7 @@ isEmpty(TARGET):error("You must set TARGET before include()'ing $${_FILE_}") -INCLUDEPATH *= $$QMAKE_INCDIR_QT/$$TARGET #just for today to have some compat diff --git a/patches/0016-Make-modules-compile-without-hardcoded-paths.patch b/patches/0016-Make-modules-compile-without-hardcoded-paths.patch index 5196d66..a5fb478 100644 --- a/patches/0016-Make-modules-compile-without-hardcoded-paths.patch +++ b/patches/0016-Make-modules-compile-without-hardcoded-paths.patch @@ -4,24 +4,24 @@ Date: Wed, 24 Nov 2010 13:21:56 -0600 Subject: [PATCH] Make modules compile without hardcoded paths --- - qtkernel/src/corelib/corelib.pro | 1 + - qtkernel/src/qbase.pri | 5 ++++- + qtbase/src/corelib/corelib.pro | 1 + + qtbase/src/qbase.pri | 5 ++++- qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro | 3 --- 3 files changed, 5 insertions(+), 4 deletions(-) -diff --git a/qtkernel/src/corelib/corelib.pro b/qtkernel/src/corelib/corelib.pro +diff --git a/qtbase/src/corelib/corelib.pro b/qtbase/src/corelib/corelib.pro index e946d5d..96f047c 100644 ---- a/qtkernel/src/corelib/corelib.pro -+++ b/qtkernel/src/corelib/corelib.pro +--- a/qtbase/src/corelib/corelib.pro ++++ b/qtbase/src/corelib/corelib.pro @@ -1,3 +1,4 @@ +MODULE = core TARGET = QtCore QPRO_PWD = $$PWD QT = -diff --git a/qtkernel/src/qbase.pri b/qtkernel/src/qbase.pri +diff --git a/qtbase/src/qbase.pri b/qtbase/src/qbase.pri index 08f4758..1742b0a 100644 ---- a/qtkernel/src/qbase.pri -+++ b/qtkernel/src/qbase.pri +--- a/qtbase/src/qbase.pri ++++ b/qtbase/src/qbase.pri @@ -1,3 +1,6 @@ +load(qt_module) + diff --git a/patches/0017-Remove-the-hardcode-QT_CONFIG-in-those-pri-files.patch b/patches/0017-Remove-the-hardcode-QT_CONFIG-in-those-pri-files.patch index 14a85e8..7575df4 100644 --- a/patches/0017-Remove-the-hardcode-QT_CONFIG-in-those-pri-files.patch +++ b/patches/0017-Remove-the-hardcode-QT_CONFIG-in-those-pri-files.patch @@ -4,113 +4,113 @@ Date: Thu, 25 Nov 2010 13:39:10 +0100 Subject: [PATCH] Remove the hardcode QT_CONFIG in those pri files. --- - qtkernel/src/modules/qt_core.pri | 2 -- - qtkernel/src/modules/qt_dbus.pri | 2 -- - qtkernel/src/modules/qt_gui.pri | 2 -- - qtkernel/src/modules/qt_network.pri | 2 -- - qtkernel/src/modules/qt_opengl.pri | 2 -- - qtkernel/src/modules/qt_openvg.pri | 2 -- - qtkernel/src/modules/qt_sql.pri | 2 -- - qtkernel/src/modules/qt_svg.pri | 2 -- - qtkernel/src/modules/qt_testlib.pri | 2 -- - qtkernel/src/modules/qt_xml.pri | 2 -- + qtbase/src/modules/qt_core.pri | 2 -- + qtbase/src/modules/qt_dbus.pri | 2 -- + qtbase/src/modules/qt_gui.pri | 2 -- + qtbase/src/modules/qt_network.pri | 2 -- + qtbase/src/modules/qt_opengl.pri | 2 -- + qtbase/src/modules/qt_openvg.pri | 2 -- + qtbase/src/modules/qt_sql.pri | 2 -- + qtbase/src/modules/qt_svg.pri | 2 -- + qtbase/src/modules/qt_testlib.pri | 2 -- + qtbase/src/modules/qt_xml.pri | 2 -- qtxmlpatterns/modules/qt_xmlpatterns.pri | 2 -- 11 files changed, 0 insertions(+), 22 deletions(-) -diff --git a/qtkernel/src/modules/qt_core.pri b/qtkernel/src/modules/qt_core.pri +diff --git a/qtbase/src/modules/qt_core.pri b/qtbase/src/modules/qt_core.pri index 742aefe..e90011a 100644 ---- a/qtkernel/src/modules/qt_core.pri -+++ b/qtkernel/src/modules/qt_core.pri +--- a/qtbase/src/modules/qt_core.pri ++++ b/qtbase/src/modules/qt_core.pri @@ -7,5 +7,3 @@ QT.core.name = QtCore QT.core.includes = $$QT_MODULE_INCLUDE_BASE/QtCore QT.core.libs = $$QT_MODULE_LIB_BASE QT.core.depends = - -QT_CONFIG += core -diff --git a/qtkernel/src/modules/qt_dbus.pri b/qtkernel/src/modules/qt_dbus.pri +diff --git a/qtbase/src/modules/qt_dbus.pri b/qtbase/src/modules/qt_dbus.pri index fddcbf7..b762353 100644 ---- a/qtkernel/src/modules/qt_dbus.pri -+++ b/qtkernel/src/modules/qt_dbus.pri +--- a/qtbase/src/modules/qt_dbus.pri ++++ b/qtbase/src/modules/qt_dbus.pri @@ -8,5 +8,3 @@ QT.dbus.includes = $$QT_MODULE_INCLUDE_BASE/QtDBus QT.dbus.libs = $$QT_MODULE_LIB_BASE QT.dbus.depends = core xml QT.dbus.CONFIG = dbusadaptors dbusinterfaces - -QT_CONFIG += dbus -diff --git a/qtkernel/src/modules/qt_gui.pri b/qtkernel/src/modules/qt_gui.pri +diff --git a/qtbase/src/modules/qt_gui.pri b/qtbase/src/modules/qt_gui.pri index 6da7431..f6b9720 100644 ---- a/qtkernel/src/modules/qt_gui.pri -+++ b/qtkernel/src/modules/qt_gui.pri +--- a/qtbase/src/modules/qt_gui.pri ++++ b/qtbase/src/modules/qt_gui.pri @@ -7,5 +7,3 @@ QT.gui.name = QtGui QT.gui.includes = $$QT_MODULE_INCLUDE_BASE/QtGui QT.gui.libs = $$QT_MODULE_LIB_BASE QT.gui.depends = core network - -QT_CONFIG += gui -diff --git a/qtkernel/src/modules/qt_network.pri b/qtkernel/src/modules/qt_network.pri +diff --git a/qtbase/src/modules/qt_network.pri b/qtbase/src/modules/qt_network.pri index 4d32079..d794b2e 100644 ---- a/qtkernel/src/modules/qt_network.pri -+++ b/qtkernel/src/modules/qt_network.pri +--- a/qtbase/src/modules/qt_network.pri ++++ b/qtbase/src/modules/qt_network.pri @@ -7,5 +7,3 @@ QT.network.name = QtNetwork QT.network.includes = $$QT_MODULE_INCLUDE_BASE/QtNetwork QT.network.libs = $$QT_MODULE_LIB_BASE QT.network.depends = core - -QT_CONFIG += network -diff --git a/qtkernel/src/modules/qt_opengl.pri b/qtkernel/src/modules/qt_opengl.pri +diff --git a/qtbase/src/modules/qt_opengl.pri b/qtbase/src/modules/qt_opengl.pri index 9ad1425..9eff7ef 100644 ---- a/qtkernel/src/modules/qt_opengl.pri -+++ b/qtkernel/src/modules/qt_opengl.pri +--- a/qtbase/src/modules/qt_opengl.pri ++++ b/qtbase/src/modules/qt_opengl.pri @@ -8,5 +8,3 @@ QT.opengl.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenGL QT.opengl.libs = $$QT_MODULE_LIB_BASE QT.opengl.depends = core gui QT.opengl.CONFIG = opengl - -QT_CONFIG += opengl -diff --git a/qtkernel/src/modules/qt_openvg.pri b/qtkernel/src/modules/qt_openvg.pri +diff --git a/qtbase/src/modules/qt_openvg.pri b/qtbase/src/modules/qt_openvg.pri index 612bd13..e9fa17f 100644 ---- a/qtkernel/src/modules/qt_openvg.pri -+++ b/qtkernel/src/modules/qt_openvg.pri +--- a/qtbase/src/modules/qt_openvg.pri ++++ b/qtbase/src/modules/qt_openvg.pri @@ -8,5 +8,3 @@ QT.openvg.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenVG QT.openvg.libs = $$QT_MODULE_LIB_BASE QT.openvg.depends = core gui QT.openvg.CONFIG = openvg - -QT_CONFIG += openvg -diff --git a/qtkernel/src/modules/qt_sql.pri b/qtkernel/src/modules/qt_sql.pri +diff --git a/qtbase/src/modules/qt_sql.pri b/qtbase/src/modules/qt_sql.pri index bf5917b..93cac45 100644 ---- a/qtkernel/src/modules/qt_sql.pri -+++ b/qtkernel/src/modules/qt_sql.pri +--- a/qtbase/src/modules/qt_sql.pri ++++ b/qtbase/src/modules/qt_sql.pri @@ -7,5 +7,3 @@ QT.sql.name = QtSql QT.sql.includes = $$QT_MODULE_INCLUDE_BASE/QtSql QT.sql.libs = $$QT_MODULE_LIB_BASE QT.sql.depends = core - -QT_CONFIG += sql -diff --git a/qtkernel/src/modules/qt_svg.pri b/qtkernel/src/modules/qt_svg.pri +diff --git a/qtbase/src/modules/qt_svg.pri b/qtbase/src/modules/qt_svg.pri index faccb78..27b4fb0 100644 ---- a/qtkernel/src/modules/qt_svg.pri -+++ b/qtkernel/src/modules/qt_svg.pri +--- a/qtbase/src/modules/qt_svg.pri ++++ b/qtbase/src/modules/qt_svg.pri @@ -7,5 +7,3 @@ QT.svg.name = QtSvg QT.svg.includes = $$QT_MODULE_INCLUDE_BASE/QtSvg QT.svg.libs = $$QT_MODULE_LIB_BASE QT.svg.depends = core gui - -QT_CONFIG += svg -diff --git a/qtkernel/src/modules/qt_testlib.pri b/qtkernel/src/modules/qt_testlib.pri +diff --git a/qtbase/src/modules/qt_testlib.pri b/qtbase/src/modules/qt_testlib.pri index 0f65438..05db9db 100644 ---- a/qtkernel/src/modules/qt_testlib.pri -+++ b/qtkernel/src/modules/qt_testlib.pri +--- a/qtbase/src/modules/qt_testlib.pri ++++ b/qtbase/src/modules/qt_testlib.pri @@ -8,5 +8,3 @@ QT.testlib.includes = $$QT_MODULE_INCLUDE_BASE/QtTest QT.testlib.libs = $$QT_MODULE_LIB_BASE QT.testlib.depends = core QT.testlib.CONFIG = console - -QT_CONFIG += testlib -diff --git a/qtkernel/src/modules/qt_xml.pri b/qtkernel/src/modules/qt_xml.pri +diff --git a/qtbase/src/modules/qt_xml.pri b/qtbase/src/modules/qt_xml.pri index 45dbc667..06fc5fc 100644 ---- a/qtkernel/src/modules/qt_xml.pri -+++ b/qtkernel/src/modules/qt_xml.pri +--- a/qtbase/src/modules/qt_xml.pri ++++ b/qtbase/src/modules/qt_xml.pri @@ -7,5 +7,3 @@ QT.xml.name = QtXml QT.xml.includes = $$QT_MODULE_INCLUDE_BASE/QtXml QT.xml.libs = $$QT_MODULE_LIB_BASE diff --git a/patches/0024-Add-the-source-path-to-the-modules-.pri-file.patch b/patches/0024-Add-the-source-path-to-the-modules-.pri-file.patch index e8dace1..69aae1c 100644 --- a/patches/0024-Add-the-source-path-to-the-modules-.pri-file.patch +++ b/patches/0024-Add-the-source-path-to-the-modules-.pri-file.patch @@ -5,17 +5,17 @@ Subject: [PATCH] Add the source path to the modules .pri file --- qt3support/modules/qt_qt3support.pri | 1 + - qtkernel/bin/syncqt | 1 + - qtkernel/src/modules/qt_core.pri | 1 + - qtkernel/src/modules/qt_dbus.pri | 1 + - qtkernel/src/modules/qt_gui.pri | 1 + - qtkernel/src/modules/qt_network.pri | 1 + - qtkernel/src/modules/qt_opengl.pri | 1 + - qtkernel/src/modules/qt_openvg.pri | 1 + - qtkernel/src/modules/qt_sql.pri | 1 + - qtkernel/src/modules/qt_svg.pri | 1 + - qtkernel/src/modules/qt_testlib.pri | 1 + - qtkernel/src/modules/qt_xml.pri | 1 + + qtbase/bin/syncqt | 1 + + qtbase/src/modules/qt_core.pri | 1 + + qtbase/src/modules/qt_dbus.pri | 1 + + qtbase/src/modules/qt_gui.pri | 1 + + qtbase/src/modules/qt_network.pri | 1 + + qtbase/src/modules/qt_opengl.pri | 1 + + qtbase/src/modules/qt_openvg.pri | 1 + + qtbase/src/modules/qt_sql.pri | 1 + + qtbase/src/modules/qt_svg.pri | 1 + + qtbase/src/modules/qt_testlib.pri | 1 + + qtbase/src/modules/qt_xml.pri | 1 + qtdeclarative/modules/qt_declarative.pri | 1 + qtscript/modules/qt_script.pri | 1 + qtscript/modules/qt_scripttools.pri | 1 + @@ -35,22 +35,22 @@ index 400b69c..86d6395 100644 QT.qt3support.libs = $$QT_MODULE_LIB_BASE QT.qt3support.depends = core gui QT.qt3support.DEFINES = QT3_SUPPORT -diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt +diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt index fa0fbd3..8b69ffb 100755 ---- a/qtkernel/bin/syncqt -+++ b/qtkernel/bin/syncqt +--- a/qtbase/bin/syncqt ++++ b/qtbase/bin/syncqt @@ -1004,6 +1004,7 @@ foreach my $lib (@modules_to_sync) { my $modulepriname = basename($modulepri); - my $moduleprifwd = "$qtkerneldir/mkspecs/modules/$modulepriname"; + my $moduleprifwd = "$qtbasedir/mkspecs/modules/$modulepriname"; open MODULE_PRI_FILE, ">$moduleprifwd"; + print MODULE_PRI_FILE "QT_MODULE_BASE = $basedir\n"; print MODULE_PRI_FILE "QT_MODULE_INCLUDE_BASE = $out_basedir/include\n"; print MODULE_PRI_FILE "QT_MODULE_LIB_BASE = $out_basedir/lib\n"; print MODULE_PRI_FILE "include($modulepri)\n"; -diff --git a/qtkernel/src/modules/qt_core.pri b/qtkernel/src/modules/qt_core.pri +diff --git a/qtbase/src/modules/qt_core.pri b/qtbase/src/modules/qt_core.pri index e90011a..246fed7 100644 ---- a/qtkernel/src/modules/qt_core.pri -+++ b/qtkernel/src/modules/qt_core.pri +--- a/qtbase/src/modules/qt_core.pri ++++ b/qtbase/src/modules/qt_core.pri @@ -5,5 +5,6 @@ QT_CORE_PATCH_VERSION = $$QT_PATCH_VERSION QT.core.name = QtCore @@ -58,10 +58,10 @@ index e90011a..246fed7 100644 +QT.core.sources = $$QT_MODULE_BASE/src/corelib QT.core.libs = $$QT_MODULE_LIB_BASE QT.core.depends = -diff --git a/qtkernel/src/modules/qt_dbus.pri b/qtkernel/src/modules/qt_dbus.pri +diff --git a/qtbase/src/modules/qt_dbus.pri b/qtbase/src/modules/qt_dbus.pri index b762353..e930949 100644 ---- a/qtkernel/src/modules/qt_dbus.pri -+++ b/qtkernel/src/modules/qt_dbus.pri +--- a/qtbase/src/modules/qt_dbus.pri ++++ b/qtbase/src/modules/qt_dbus.pri @@ -5,6 +5,7 @@ QT_DBUS_PATCH_VERSION = $$QT_PATCH_VERSION QT.dbus.name = QtDBus @@ -70,10 +70,10 @@ index b762353..e930949 100644 QT.dbus.libs = $$QT_MODULE_LIB_BASE QT.dbus.depends = core xml QT.dbus.CONFIG = dbusadaptors dbusinterfaces -diff --git a/qtkernel/src/modules/qt_gui.pri b/qtkernel/src/modules/qt_gui.pri +diff --git a/qtbase/src/modules/qt_gui.pri b/qtbase/src/modules/qt_gui.pri index f6b9720..0f5da2f 100644 ---- a/qtkernel/src/modules/qt_gui.pri -+++ b/qtkernel/src/modules/qt_gui.pri +--- a/qtbase/src/modules/qt_gui.pri ++++ b/qtbase/src/modules/qt_gui.pri @@ -5,5 +5,6 @@ QT_GUI_PATCH_VERSION = $$QT_PATCH_VERSION QT.gui.name = QtGui @@ -81,10 +81,10 @@ index f6b9720..0f5da2f 100644 +QT.gui.sources = $$QT_MODULE_BASE/src/gui QT.gui.libs = $$QT_MODULE_LIB_BASE QT.gui.depends = core network -diff --git a/qtkernel/src/modules/qt_network.pri b/qtkernel/src/modules/qt_network.pri +diff --git a/qtbase/src/modules/qt_network.pri b/qtbase/src/modules/qt_network.pri index d794b2e..4a9ae46 100644 ---- a/qtkernel/src/modules/qt_network.pri -+++ b/qtkernel/src/modules/qt_network.pri +--- a/qtbase/src/modules/qt_network.pri ++++ b/qtbase/src/modules/qt_network.pri @@ -5,5 +5,6 @@ QT_NETWORK_PATCH_VERSION = $$QT_PATCH_VERSION QT.network.name = QtNetwork @@ -92,10 +92,10 @@ index d794b2e..4a9ae46 100644 +QT.network.sources = $$QT_MODULE_BASE/src/network QT.network.libs = $$QT_MODULE_LIB_BASE QT.network.depends = core -diff --git a/qtkernel/src/modules/qt_opengl.pri b/qtkernel/src/modules/qt_opengl.pri +diff --git a/qtbase/src/modules/qt_opengl.pri b/qtbase/src/modules/qt_opengl.pri index 9eff7ef..71cfa2f 100644 ---- a/qtkernel/src/modules/qt_opengl.pri -+++ b/qtkernel/src/modules/qt_opengl.pri +--- a/qtbase/src/modules/qt_opengl.pri ++++ b/qtbase/src/modules/qt_opengl.pri @@ -5,6 +5,7 @@ QT_OPENGL_PATCH_VERSION = $$QT_PATCH_VERSION QT.opengl.name = QtOpenGL @@ -104,10 +104,10 @@ index 9eff7ef..71cfa2f 100644 QT.opengl.libs = $$QT_MODULE_LIB_BASE QT.opengl.depends = core gui QT.opengl.CONFIG = opengl -diff --git a/qtkernel/src/modules/qt_openvg.pri b/qtkernel/src/modules/qt_openvg.pri +diff --git a/qtbase/src/modules/qt_openvg.pri b/qtbase/src/modules/qt_openvg.pri index e9fa17f..bd50abb 100644 ---- a/qtkernel/src/modules/qt_openvg.pri -+++ b/qtkernel/src/modules/qt_openvg.pri +--- a/qtbase/src/modules/qt_openvg.pri ++++ b/qtbase/src/modules/qt_openvg.pri @@ -5,6 +5,7 @@ QT_OPENVG_PATCH_VERSION = $$QT_PATCH_VERSION QT.openvg.name = QtOpenVG @@ -116,10 +116,10 @@ index e9fa17f..bd50abb 100644 QT.openvg.libs = $$QT_MODULE_LIB_BASE QT.openvg.depends = core gui QT.openvg.CONFIG = openvg -diff --git a/qtkernel/src/modules/qt_sql.pri b/qtkernel/src/modules/qt_sql.pri +diff --git a/qtbase/src/modules/qt_sql.pri b/qtbase/src/modules/qt_sql.pri index 93cac45..4ec18f0 100644 ---- a/qtkernel/src/modules/qt_sql.pri -+++ b/qtkernel/src/modules/qt_sql.pri +--- a/qtbase/src/modules/qt_sql.pri ++++ b/qtbase/src/modules/qt_sql.pri @@ -5,5 +5,6 @@ QT_SQL_PATCH_VERSION = $$QT_PATCH_VERSION QT.sql.name = QtSql @@ -127,10 +127,10 @@ index 93cac45..4ec18f0 100644 +QT.sql.sources = $$QT_MODULE_BASE/src/sql QT.sql.libs = $$QT_MODULE_LIB_BASE QT.sql.depends = core -diff --git a/qtkernel/src/modules/qt_svg.pri b/qtkernel/src/modules/qt_svg.pri +diff --git a/qtbase/src/modules/qt_svg.pri b/qtbase/src/modules/qt_svg.pri index 27b4fb0..1be80f6 100644 ---- a/qtkernel/src/modules/qt_svg.pri -+++ b/qtkernel/src/modules/qt_svg.pri +--- a/qtbase/src/modules/qt_svg.pri ++++ b/qtbase/src/modules/qt_svg.pri @@ -5,5 +5,6 @@ QT_SVG_PATCH_VERSION = $$QT_PATCH_VERSION QT.svg.name = QtSvg @@ -138,10 +138,10 @@ index 27b4fb0..1be80f6 100644 +QT.svg.sources = $$QT_MODULE_BASE/src/svg QT.svg.libs = $$QT_MODULE_LIB_BASE QT.svg.depends = core gui -diff --git a/qtkernel/src/modules/qt_testlib.pri b/qtkernel/src/modules/qt_testlib.pri +diff --git a/qtbase/src/modules/qt_testlib.pri b/qtbase/src/modules/qt_testlib.pri index 05db9db..ffca9f0 100644 ---- a/qtkernel/src/modules/qt_testlib.pri -+++ b/qtkernel/src/modules/qt_testlib.pri +--- a/qtbase/src/modules/qt_testlib.pri ++++ b/qtbase/src/modules/qt_testlib.pri @@ -5,6 +5,7 @@ QT_TEST_PATCH_VERSION = $$QT_PATCH_VERSION QT.testlib.name = QtTest @@ -150,10 +150,10 @@ index 05db9db..ffca9f0 100644 QT.testlib.libs = $$QT_MODULE_LIB_BASE QT.testlib.depends = core QT.testlib.CONFIG = console -diff --git a/qtkernel/src/modules/qt_xml.pri b/qtkernel/src/modules/qt_xml.pri +diff --git a/qtbase/src/modules/qt_xml.pri b/qtbase/src/modules/qt_xml.pri index 06fc5fc..4932ae5 100644 ---- a/qtkernel/src/modules/qt_xml.pri -+++ b/qtkernel/src/modules/qt_xml.pri +--- a/qtbase/src/modules/qt_xml.pri ++++ b/qtbase/src/modules/qt_xml.pri @@ -5,5 +5,6 @@ QT_XML_PATCH_VERSION = $$QT_PATCH_VERSION QT.xml.name = QtXml diff --git a/patches/0026-Add-the-private_includes-path-to-the-modules-.pri-fi.patch b/patches/0026-Add-the-private_includes-path-to-the-modules-.pri-fi.patch index 007281b..b41cfd6 100644 --- a/patches/0026-Add-the-private_includes-path-to-the-modules-.pri-fi.patch +++ b/patches/0026-Add-the-private_includes-path-to-the-modules-.pri-fi.patch @@ -5,16 +5,16 @@ Subject: [PATCH] Add the private_includes path to the modules .pri file --- qt3support/modules/qt_qt3support.pri | 1 + - qtkernel/src/modules/qt_core.pri | 1 + - qtkernel/src/modules/qt_dbus.pri | 1 + - qtkernel/src/modules/qt_gui.pri | 1 + - qtkernel/src/modules/qt_network.pri | 1 + - qtkernel/src/modules/qt_opengl.pri | 1 + - qtkernel/src/modules/qt_openvg.pri | 1 + - qtkernel/src/modules/qt_sql.pri | 1 + - qtkernel/src/modules/qt_svg.pri | 1 + - qtkernel/src/modules/qt_testlib.pri | 1 + - qtkernel/src/modules/qt_xml.pri | 1 + + qtbase/src/modules/qt_core.pri | 1 + + qtbase/src/modules/qt_dbus.pri | 1 + + qtbase/src/modules/qt_gui.pri | 1 + + qtbase/src/modules/qt_network.pri | 1 + + qtbase/src/modules/qt_opengl.pri | 1 + + qtbase/src/modules/qt_openvg.pri | 1 + + qtbase/src/modules/qt_sql.pri | 1 + + qtbase/src/modules/qt_svg.pri | 1 + + qtbase/src/modules/qt_testlib.pri | 1 + + qtbase/src/modules/qt_xml.pri | 1 + qtdeclarative/modules/qt_declarative.pri | 1 + qtscript/modules/qt_script.pri | 1 + qtscript/modules/qt_scripttools.pri | 1 + @@ -36,10 +36,10 @@ index 86d6395..76ad617 100644 QT.qt3support.sources = $$QT_MODULE_BASE/src/qt3support QT.qt3support.libs = $$QT_MODULE_LIB_BASE QT.qt3support.depends = core gui -diff --git a/qtkernel/src/modules/qt_core.pri b/qtkernel/src/modules/qt_core.pri +diff --git a/qtbase/src/modules/qt_core.pri b/qtbase/src/modules/qt_core.pri index 246fed7..92e1d21 100644 ---- a/qtkernel/src/modules/qt_core.pri -+++ b/qtkernel/src/modules/qt_core.pri +--- a/qtbase/src/modules/qt_core.pri ++++ b/qtbase/src/modules/qt_core.pri @@ -5,6 +5,7 @@ QT_CORE_PATCH_VERSION = $$QT_PATCH_VERSION QT.core.name = QtCore @@ -48,10 +48,10 @@ index 246fed7..92e1d21 100644 QT.core.sources = $$QT_MODULE_BASE/src/corelib QT.core.libs = $$QT_MODULE_LIB_BASE QT.core.depends = -diff --git a/qtkernel/src/modules/qt_dbus.pri b/qtkernel/src/modules/qt_dbus.pri +diff --git a/qtbase/src/modules/qt_dbus.pri b/qtbase/src/modules/qt_dbus.pri index e930949..0a0618e 100644 ---- a/qtkernel/src/modules/qt_dbus.pri -+++ b/qtkernel/src/modules/qt_dbus.pri +--- a/qtbase/src/modules/qt_dbus.pri ++++ b/qtbase/src/modules/qt_dbus.pri @@ -5,6 +5,7 @@ QT_DBUS_PATCH_VERSION = $$QT_PATCH_VERSION QT.dbus.name = QtDBus @@ -60,10 +60,10 @@ index e930949..0a0618e 100644 QT.dbus.sources = $$QT_MODULE_BASE/src/dbus QT.dbus.libs = $$QT_MODULE_LIB_BASE QT.dbus.depends = core xml -diff --git a/qtkernel/src/modules/qt_gui.pri b/qtkernel/src/modules/qt_gui.pri +diff --git a/qtbase/src/modules/qt_gui.pri b/qtbase/src/modules/qt_gui.pri index 0f5da2f..e88be8f 100644 ---- a/qtkernel/src/modules/qt_gui.pri -+++ b/qtkernel/src/modules/qt_gui.pri +--- a/qtbase/src/modules/qt_gui.pri ++++ b/qtbase/src/modules/qt_gui.pri @@ -5,6 +5,7 @@ QT_GUI_PATCH_VERSION = $$QT_PATCH_VERSION QT.gui.name = QtGui @@ -72,10 +72,10 @@ index 0f5da2f..e88be8f 100644 QT.gui.sources = $$QT_MODULE_BASE/src/gui QT.gui.libs = $$QT_MODULE_LIB_BASE QT.gui.depends = core network -diff --git a/qtkernel/src/modules/qt_network.pri b/qtkernel/src/modules/qt_network.pri +diff --git a/qtbase/src/modules/qt_network.pri b/qtbase/src/modules/qt_network.pri index 4a9ae46..d0fe251 100644 ---- a/qtkernel/src/modules/qt_network.pri -+++ b/qtkernel/src/modules/qt_network.pri +--- a/qtbase/src/modules/qt_network.pri ++++ b/qtbase/src/modules/qt_network.pri @@ -5,6 +5,7 @@ QT_NETWORK_PATCH_VERSION = $$QT_PATCH_VERSION QT.network.name = QtNetwork @@ -84,10 +84,10 @@ index 4a9ae46..d0fe251 100644 QT.network.sources = $$QT_MODULE_BASE/src/network QT.network.libs = $$QT_MODULE_LIB_BASE QT.network.depends = core -diff --git a/qtkernel/src/modules/qt_opengl.pri b/qtkernel/src/modules/qt_opengl.pri +diff --git a/qtbase/src/modules/qt_opengl.pri b/qtbase/src/modules/qt_opengl.pri index 71cfa2f..a552407 100644 ---- a/qtkernel/src/modules/qt_opengl.pri -+++ b/qtkernel/src/modules/qt_opengl.pri +--- a/qtbase/src/modules/qt_opengl.pri ++++ b/qtbase/src/modules/qt_opengl.pri @@ -5,6 +5,7 @@ QT_OPENGL_PATCH_VERSION = $$QT_PATCH_VERSION QT.opengl.name = QtOpenGL @@ -96,10 +96,10 @@ index 71cfa2f..a552407 100644 QT.opengl.sources = $$QT_MODULE_BASE/src/opengl QT.opengl.libs = $$QT_MODULE_LIB_BASE QT.opengl.depends = core gui -diff --git a/qtkernel/src/modules/qt_openvg.pri b/qtkernel/src/modules/qt_openvg.pri +diff --git a/qtbase/src/modules/qt_openvg.pri b/qtbase/src/modules/qt_openvg.pri index bd50abb..67fb6ae 100644 ---- a/qtkernel/src/modules/qt_openvg.pri -+++ b/qtkernel/src/modules/qt_openvg.pri +--- a/qtbase/src/modules/qt_openvg.pri ++++ b/qtbase/src/modules/qt_openvg.pri @@ -5,6 +5,7 @@ QT_OPENVG_PATCH_VERSION = $$QT_PATCH_VERSION QT.openvg.name = QtOpenVG @@ -108,10 +108,10 @@ index bd50abb..67fb6ae 100644 QT.openvg.sources = $$QT_MODULE_BASE/src/openvg QT.openvg.libs = $$QT_MODULE_LIB_BASE QT.openvg.depends = core gui -diff --git a/qtkernel/src/modules/qt_sql.pri b/qtkernel/src/modules/qt_sql.pri +diff --git a/qtbase/src/modules/qt_sql.pri b/qtbase/src/modules/qt_sql.pri index 4ec18f0..3ca3df9 100644 ---- a/qtkernel/src/modules/qt_sql.pri -+++ b/qtkernel/src/modules/qt_sql.pri +--- a/qtbase/src/modules/qt_sql.pri ++++ b/qtbase/src/modules/qt_sql.pri @@ -5,6 +5,7 @@ QT_SQL_PATCH_VERSION = $$QT_PATCH_VERSION QT.sql.name = QtSql @@ -120,10 +120,10 @@ index 4ec18f0..3ca3df9 100644 QT.sql.sources = $$QT_MODULE_BASE/src/sql QT.sql.libs = $$QT_MODULE_LIB_BASE QT.sql.depends = core -diff --git a/qtkernel/src/modules/qt_svg.pri b/qtkernel/src/modules/qt_svg.pri +diff --git a/qtbase/src/modules/qt_svg.pri b/qtbase/src/modules/qt_svg.pri index 1be80f6..90df93f 100644 ---- a/qtkernel/src/modules/qt_svg.pri -+++ b/qtkernel/src/modules/qt_svg.pri +--- a/qtbase/src/modules/qt_svg.pri ++++ b/qtbase/src/modules/qt_svg.pri @@ -5,6 +5,7 @@ QT_SVG_PATCH_VERSION = $$QT_PATCH_VERSION QT.svg.name = QtSvg @@ -132,10 +132,10 @@ index 1be80f6..90df93f 100644 QT.svg.sources = $$QT_MODULE_BASE/src/svg QT.svg.libs = $$QT_MODULE_LIB_BASE QT.svg.depends = core gui -diff --git a/qtkernel/src/modules/qt_testlib.pri b/qtkernel/src/modules/qt_testlib.pri +diff --git a/qtbase/src/modules/qt_testlib.pri b/qtbase/src/modules/qt_testlib.pri index ffca9f0..44ebf3c 100644 ---- a/qtkernel/src/modules/qt_testlib.pri -+++ b/qtkernel/src/modules/qt_testlib.pri +--- a/qtbase/src/modules/qt_testlib.pri ++++ b/qtbase/src/modules/qt_testlib.pri @@ -5,6 +5,7 @@ QT_TEST_PATCH_VERSION = $$QT_PATCH_VERSION QT.testlib.name = QtTest @@ -144,10 +144,10 @@ index ffca9f0..44ebf3c 100644 QT.testlib.sources = $$QT_MODULE_BASE/src/testlib QT.testlib.libs = $$QT_MODULE_LIB_BASE QT.testlib.depends = core -diff --git a/qtkernel/src/modules/qt_xml.pri b/qtkernel/src/modules/qt_xml.pri +diff --git a/qtbase/src/modules/qt_xml.pri b/qtbase/src/modules/qt_xml.pri index 4932ae5..8c47bfc 100644 ---- a/qtkernel/src/modules/qt_xml.pri -+++ b/qtkernel/src/modules/qt_xml.pri +--- a/qtbase/src/modules/qt_xml.pri ++++ b/qtbase/src/modules/qt_xml.pri @@ -5,6 +5,7 @@ QT_XML_PATCH_VERSION = $$QT_PATCH_VERSION QT.xml.name = QtXml diff --git a/patches/0027-Move-QtSvg-into-a-separate-repository.patch b/patches/0027-Move-QtSvg-into-a-separate-repository.patch index 5ff987b..2b58d8d 100644 --- a/patches/0027-Move-QtSvg-into-a-separate-repository.patch +++ b/patches/0027-Move-QtSvg-into-a-separate-repository.patch @@ -4,23 +4,23 @@ Date: Mon, 27 Dec 2010 14:49:29 +0100 Subject: [PATCH] Move QtSvg into a separate repository --- - qtkernel/src/plugins/imageformats/imageformats.pro | 1 - - qtkernel/src/plugins/plugins.pro | 2 +- - qtkernel/src/src.pro | 9 +-------- - qtkernel/sync.profile | 3 --- - {qtkernel/src => qtsvg}/modules/qt_svg.pri | 2 +- + qtbase/src/plugins/imageformats/imageformats.pro | 1 - + qtbase/src/plugins/plugins.pro | 2 +- + qtbase/src/src.pro | 9 +-------- + qtbase/sync.profile | 3 --- + {qtbase/src => qtsvg}/modules/qt_svg.pri | 2 +- .../iconengines/svgiconengine/svgiconengine.pro | 6 ++++-- qtsvg/src/plugins/imageformats/svg/svg.pro | 6 ++++-- qtsvg/src/svg/svg.pro | 9 +++++---- qtsvg/sync.profile | 14 ++++++++++++++ 9 files changed, 30 insertions(+), 22 deletions(-) - rename {qtkernel/src => qtsvg}/modules/qt_svg.pri (82%) + rename {qtbase/src => qtsvg}/modules/qt_svg.pri (82%) create mode 100644 qtsvg/sync.profile -diff --git a/qtkernel/src/plugins/imageformats/imageformats.pro b/qtkernel/src/plugins/imageformats/imageformats.pro +diff --git a/qtbase/src/plugins/imageformats/imageformats.pro b/qtbase/src/plugins/imageformats/imageformats.pro index 5fff2de..66dea09 100644 ---- a/qtkernel/src/plugins/imageformats/imageformats.pro -+++ b/qtkernel/src/plugins/imageformats/imageformats.pro +--- a/qtbase/src/plugins/imageformats/imageformats.pro ++++ b/qtbase/src/plugins/imageformats/imageformats.pro @@ -3,6 +3,5 @@ TEMPLATE = subdirs !contains(QT_CONFIG, no-jpeg):!contains(QT_CONFIG, jpeg):SUBDIRS += jpeg !contains(QT_CONFIG, no-gif):!contains(QT_CONFIG, gif):SUBDIRS += gif @@ -28,10 +28,10 @@ index 5fff2de..66dea09 100644 -contains(QT_CONFIG, svg):SUBDIRS += svg !contains(QT_CONFIG, no-tiff):!contains(QT_CONFIG, tiff):SUBDIRS += tiff !contains(QT_CONFIG, no-ico):SUBDIRS += ico -diff --git a/qtkernel/src/plugins/plugins.pro b/qtkernel/src/plugins/plugins.pro +diff --git a/qtbase/src/plugins/plugins.pro b/qtbase/src/plugins/plugins.pro index d0d7188..c1aff35 100644 ---- a/qtkernel/src/plugins/plugins.pro -+++ b/qtkernel/src/plugins/plugins.pro +--- a/qtbase/src/plugins/plugins.pro ++++ b/qtbase/src/plugins/plugins.pro @@ -6,7 +6,7 @@ unix:!symbian { } else { SUBDIRS *= codecs @@ -41,10 +41,10 @@ index d0d7188..c1aff35 100644 !embedded:!qpa:SUBDIRS *= graphicssystems embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers !win32:!embedded:!mac:!symbian:SUBDIRS *= inputmethods -diff --git a/qtkernel/src/src.pro b/qtkernel/src/src.pro +diff --git a/qtbase/src/src.pro b/qtbase/src/src.pro index 6da0877..2f65a08 100644 ---- a/qtkernel/src/src.pro -+++ b/qtkernel/src/src.pro +--- a/qtbase/src/src.pro ++++ b/qtbase/src/src.pro @@ -13,7 +13,6 @@ nacl: SRC_SUBDIRS -= src_network src_testlib contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): SRC_SUBDIRS += src_opengl @@ -52,7 +52,7 @@ index 6da0877..2f65a08 100644 -contains(QT_CONFIG, svg): SRC_SUBDIRS += src_svg SRC_SUBDIRS += src_plugins - # s60installs need to be at the end, because qtkernel.pro does an ordered build, + # s60installs need to be at the end, because qtbase.pro does an ordered build, @@ -38,8 +37,6 @@ src_sql.subdir = $$QT_SOURCE_TREE/src/sql src_sql.target = sub-sql src_network.subdir = $$QT_SOURCE_TREE/src/network @@ -89,10 +89,10 @@ index 6da0877..2f65a08 100644 } -diff --git a/qtkernel/sync.profile b/qtkernel/sync.profile +diff --git a/qtbase/sync.profile b/qtbase/sync.profile index c8ef4fc..7984329 100644 ---- a/qtkernel/sync.profile -+++ b/qtkernel/sync.profile +--- a/qtbase/sync.profile ++++ b/qtbase/sync.profile @@ -6,7 +6,6 @@ "QtXml" => "$basedir/src/xml", "QtSql" => "$basedir/src/sql", @@ -117,12 +117,12 @@ index c8ef4fc..7984329 100644 "QtTest" => "$basedir/src/modules/qt_testlib.pri", "QtXml" => "$basedir/src/modules/qt_xml.pri", ); -diff --git a/qtkernel/src/modules/qt_svg.pri b/qtsvg/modules/qt_svg.pri +diff --git a/qtbase/src/modules/qt_svg.pri b/qtsvg/modules/qt_svg.pri similarity index 82% -rename from qtkernel/src/modules/qt_svg.pri +rename from qtbase/src/modules/qt_svg.pri rename to qtsvg/modules/qt_svg.pri index 90df93f..5fa3212 100644 ---- a/qtkernel/src/modules/qt_svg.pri +--- a/qtbase/src/modules/qt_svg.pri +++ b/qtsvg/modules/qt_svg.pri @@ -4,7 +4,7 @@ QT_SVG_MINOR_VERSION = $$QT_MINOR_VERSION QT_SVG_PATCH_VERSION = $$QT_PATCH_VERSION diff --git a/patches/0028-Add-hardcoded-qclass_lib_map.h-based-on-4.8.patch b/patches/0028-Add-hardcoded-qclass_lib_map.h-based-on-4.8.patch index a94491a..e44a933 100644 --- a/patches/0028-Add-hardcoded-qclass_lib_map.h-based-on-4.8.patch +++ b/patches/0028-Add-hardcoded-qclass_lib_map.h-based-on-4.8.patch @@ -5,15 +5,15 @@ Subject: [PATCH] Add hardcoded qclass_lib_map.h based on 4.8 This is only until UIC/Designer handles this properly --- - qtkernel/bin/syncqt | 2 +- - qtkernel/src/tools/uic/qclass_lib_map.h | 1437 +++++++++++++++++++++++++++++++ + qtbase/bin/syncqt | 2 +- + qtbase/src/tools/uic/qclass_lib_map.h | 1437 +++++++++++++++++++++++++++++++ 2 files changed, 1438 insertions(+), 1 deletions(-) - create mode 100644 qtkernel/src/tools/uic/qclass_lib_map.h + create mode 100644 qtbase/src/tools/uic/qclass_lib_map.h -diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt +diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt index afe873f..0894c80 100755 ---- a/qtkernel/bin/syncqt -+++ b/qtkernel/bin/syncqt +--- a/qtbase/bin/syncqt ++++ b/qtbase/bin/syncqt @@ -44,7 +44,7 @@ my $force_win = 0; my $force_relative = 0; my $check_includes = 0; @@ -23,11 +23,11 @@ index afe873f..0894c80 100755 my $create_private_headers = 1; my $no_module_fwd = 0; my @modules_to_sync ; -diff --git a/qtkernel/src/tools/uic/qclass_lib_map.h b/qtkernel/src/tools/uic/qclass_lib_map.h +diff --git a/qtbase/src/tools/uic/qclass_lib_map.h b/qtbase/src/tools/uic/qclass_lib_map.h new file mode 100644 index 0000000..35b4f92 --- /dev/null -+++ b/qtkernel/src/tools/uic/qclass_lib_map.h ++++ b/qtbase/src/tools/uic/qclass_lib_map.h @@ -0,0 +1,1437 @@ +QT_CLASS_LIB(QAbstractAnimation, QtCore, qabstractanimation.h) +QT_CLASS_LIB(QAnimationDriver, QtCore, qabstractanimation.h) diff --git a/patches/0031-Extended-module-profiles.patch b/patches/0031-Extended-module-profiles.patch index 701f141..c22d329 100644 --- a/patches/0031-Extended-module-profiles.patch +++ b/patches/0031-Extended-module-profiles.patch @@ -6,16 +6,16 @@ Subject: [PATCH] Extended module profiles. Each module now sets the QT_CONFIG variable itself. --- qt3support/modules/qt_qt3support.pri | 8 ++++- - qtkernel/configure | 59 ++++++++++++++++-------------- - qtkernel/src/modules/qt_core.pri | 1 + - qtkernel/src/modules/qt_dbus.pri | 1 + - qtkernel/src/modules/qt_gui.pri | 1 + - qtkernel/src/modules/qt_network.pri | 1 + - qtkernel/src/modules/qt_opengl.pri | 1 + - qtkernel/src/modules/qt_openvg.pri | 1 + - qtkernel/src/modules/qt_sql.pri | 1 + - qtkernel/src/modules/qt_testlib.pri | 1 + - qtkernel/src/modules/qt_xml.pri | 1 + + qtbase/configure | 59 ++++++++++++++++-------------- + qtbase/src/modules/qt_core.pri | 1 + + qtbase/src/modules/qt_dbus.pri | 1 + + qtbase/src/modules/qt_gui.pri | 1 + + qtbase/src/modules/qt_network.pri | 1 + + qtbase/src/modules/qt_opengl.pri | 1 + + qtbase/src/modules/qt_openvg.pri | 1 + + qtbase/src/modules/qt_sql.pri | 1 + + qtbase/src/modules/qt_testlib.pri | 1 + + qtbase/src/modules/qt_xml.pri | 1 + qtdeclarative/modules/qt_declarative.pri | 3 ++ qtscript/modules/qt_script.pri | 3 ++ qtscript/modules/qt_scripttools.pri | 3 ++ @@ -42,10 +42,10 @@ index 76ad617..5554999 100644 +} else { + warning("Attempted to include $$QT.qt3support.name in the build, but $$QT.gui.name was not built with $$QT.qt3support.name enabled.") +} -diff --git a/qtkernel/configure b/qtkernel/configure +diff --git a/qtbase/configure b/qtbase/configure index c6cef4e..8916516 100755 ---- a/qtkernel/configure -+++ b/qtkernel/configure +--- a/qtbase/configure ++++ b/qtbase/configure @@ -6901,12 +6901,13 @@ esac # enable Qt 3 support functionality @@ -155,82 +155,82 @@ index c6cef4e..8916516 100755 if [ "$CFG_DECLARATIVE_DEBUG" = "no" ]; then QCONFIG_FLAGS="$QCONFIG_FLAGS QDECLARATIVE_NO_DEBUG_PROTOCOL" fi -diff --git a/qtkernel/src/modules/qt_core.pri b/qtkernel/src/modules/qt_core.pri +diff --git a/qtbase/src/modules/qt_core.pri b/qtbase/src/modules/qt_core.pri index 92e1d21..494f96f 100644 ---- a/qtkernel/src/modules/qt_core.pri -+++ b/qtkernel/src/modules/qt_core.pri +--- a/qtbase/src/modules/qt_core.pri ++++ b/qtbase/src/modules/qt_core.pri @@ -9,3 +9,4 @@ QT.core.private_includes = $$QT_MODULE_INCLUDE_BASE/QtCore/private QT.core.sources = $$QT_MODULE_BASE/src/corelib QT.core.libs = $$QT_MODULE_LIB_BASE QT.core.depends = +QT.core.DEFINES = QT_CORE_LIB -diff --git a/qtkernel/src/modules/qt_dbus.pri b/qtkernel/src/modules/qt_dbus.pri +diff --git a/qtbase/src/modules/qt_dbus.pri b/qtbase/src/modules/qt_dbus.pri index 0a0618e..73fdf99 100644 ---- a/qtkernel/src/modules/qt_dbus.pri -+++ b/qtkernel/src/modules/qt_dbus.pri +--- a/qtbase/src/modules/qt_dbus.pri ++++ b/qtbase/src/modules/qt_dbus.pri @@ -10,3 +10,4 @@ QT.dbus.sources = $$QT_MODULE_BASE/src/dbus QT.dbus.libs = $$QT_MODULE_LIB_BASE QT.dbus.depends = core xml QT.dbus.CONFIG = dbusadaptors dbusinterfaces +QT.dbus.DEFINES = QT_DBUS_LIB -diff --git a/qtkernel/src/modules/qt_gui.pri b/qtkernel/src/modules/qt_gui.pri +diff --git a/qtbase/src/modules/qt_gui.pri b/qtbase/src/modules/qt_gui.pri index e88be8f..74d2931 100644 ---- a/qtkernel/src/modules/qt_gui.pri -+++ b/qtkernel/src/modules/qt_gui.pri +--- a/qtbase/src/modules/qt_gui.pri ++++ b/qtbase/src/modules/qt_gui.pri @@ -9,3 +9,4 @@ QT.gui.private_includes = $$QT_MODULE_INCLUDE_BASE/QtGui/private QT.gui.sources = $$QT_MODULE_BASE/src/gui QT.gui.libs = $$QT_MODULE_LIB_BASE QT.gui.depends = core network +QT.gui.DEFINES = QT_GUI_LIB -diff --git a/qtkernel/src/modules/qt_network.pri b/qtkernel/src/modules/qt_network.pri +diff --git a/qtbase/src/modules/qt_network.pri b/qtbase/src/modules/qt_network.pri index d0fe251..c8b1f00 100644 ---- a/qtkernel/src/modules/qt_network.pri -+++ b/qtkernel/src/modules/qt_network.pri +--- a/qtbase/src/modules/qt_network.pri ++++ b/qtbase/src/modules/qt_network.pri @@ -9,3 +9,4 @@ QT.network.private_includes = $$QT_MODULE_INCLUDE_BASE/QtNetwork/private QT.network.sources = $$QT_MODULE_BASE/src/network QT.network.libs = $$QT_MODULE_LIB_BASE QT.network.depends = core +QT.network.DEFINES = QT_NETWORK_LIB -diff --git a/qtkernel/src/modules/qt_opengl.pri b/qtkernel/src/modules/qt_opengl.pri +diff --git a/qtbase/src/modules/qt_opengl.pri b/qtbase/src/modules/qt_opengl.pri index a552407..eb47b00 100644 ---- a/qtkernel/src/modules/qt_opengl.pri -+++ b/qtkernel/src/modules/qt_opengl.pri +--- a/qtbase/src/modules/qt_opengl.pri ++++ b/qtbase/src/modules/qt_opengl.pri @@ -10,3 +10,4 @@ QT.opengl.sources = $$QT_MODULE_BASE/src/opengl QT.opengl.libs = $$QT_MODULE_LIB_BASE QT.opengl.depends = core gui QT.opengl.CONFIG = opengl +QT.opengl.DEFINES = QT_OPENGL_LIB -diff --git a/qtkernel/src/modules/qt_openvg.pri b/qtkernel/src/modules/qt_openvg.pri +diff --git a/qtbase/src/modules/qt_openvg.pri b/qtbase/src/modules/qt_openvg.pri index 67fb6ae..09811ba 100644 ---- a/qtkernel/src/modules/qt_openvg.pri -+++ b/qtkernel/src/modules/qt_openvg.pri +--- a/qtbase/src/modules/qt_openvg.pri ++++ b/qtbase/src/modules/qt_openvg.pri @@ -10,3 +10,4 @@ QT.openvg.sources = $$QT_MODULE_BASE/src/openvg QT.openvg.libs = $$QT_MODULE_LIB_BASE QT.openvg.depends = core gui QT.openvg.CONFIG = openvg +QT.openvg.DEFINES = QT_OPENVG_LIB -diff --git a/qtkernel/src/modules/qt_sql.pri b/qtkernel/src/modules/qt_sql.pri +diff --git a/qtbase/src/modules/qt_sql.pri b/qtbase/src/modules/qt_sql.pri index 3ca3df9..42dde1b 100644 ---- a/qtkernel/src/modules/qt_sql.pri -+++ b/qtkernel/src/modules/qt_sql.pri +--- a/qtbase/src/modules/qt_sql.pri ++++ b/qtbase/src/modules/qt_sql.pri @@ -9,3 +9,4 @@ QT.sql.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSql/private QT.sql.sources = $$QT_MODULE_BASE/src/sql QT.sql.libs = $$QT_MODULE_LIB_BASE QT.sql.depends = core +QT.sql.DEFINES = QT_SQL_LIB -diff --git a/qtkernel/src/modules/qt_testlib.pri b/qtkernel/src/modules/qt_testlib.pri +diff --git a/qtbase/src/modules/qt_testlib.pri b/qtbase/src/modules/qt_testlib.pri index 44ebf3c..5971808 100644 ---- a/qtkernel/src/modules/qt_testlib.pri -+++ b/qtkernel/src/modules/qt_testlib.pri +--- a/qtbase/src/modules/qt_testlib.pri ++++ b/qtbase/src/modules/qt_testlib.pri @@ -10,3 +10,4 @@ QT.testlib.sources = $$QT_MODULE_BASE/src/testlib QT.testlib.libs = $$QT_MODULE_LIB_BASE QT.testlib.depends = core QT.testlib.CONFIG = console +QT.testlib.DEFINES = QT_TESTLIB_LIB -diff --git a/qtkernel/src/modules/qt_xml.pri b/qtkernel/src/modules/qt_xml.pri +diff --git a/qtbase/src/modules/qt_xml.pri b/qtbase/src/modules/qt_xml.pri index 8c47bfc..c0c630c 100644 ---- a/qtkernel/src/modules/qt_xml.pri -+++ b/qtkernel/src/modules/qt_xml.pri +--- a/qtbase/src/modules/qt_xml.pri ++++ b/qtbase/src/modules/qt_xml.pri @@ -9,3 +9,4 @@ QT.xml.private_includes = $$QT_MODULE_INCLUDE_BASE/QtXml/private QT.xml.sources = $$QT_MODULE_BASE/src/xml QT.xml.libs = $$QT_MODULE_LIB_BASE diff --git a/patches/0032-Corrected-include-path-for-UiTools.patch b/patches/0032-Corrected-include-path-for-UiTools.patch index 261a7c1..9cba0e0 100644 --- a/patches/0032-Corrected-include-path-for-UiTools.patch +++ b/patches/0032-Corrected-include-path-for-UiTools.patch @@ -4,13 +4,13 @@ Date: Mon, 3 Jan 2011 19:12:55 +0100 Subject: [PATCH] Corrected include path for UiTools. --- - qtkernel/mkspecs/features/uitools.prf | 2 +- + qtbase/mkspecs/features/uitools.prf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -diff --git a/qtkernel/mkspecs/features/uitools.prf b/qtkernel/mkspecs/features/uitools.prf +diff --git a/qtbase/mkspecs/features/uitools.prf b/qtbase/mkspecs/features/uitools.prf index 2d14b04..f64023c 100644 ---- a/qtkernel/mkspecs/features/uitools.prf -+++ b/qtkernel/mkspecs/features/uitools.prf +--- a/qtbase/mkspecs/features/uitools.prf ++++ b/qtbase/mkspecs/features/uitools.prf @@ -11,4 +11,4 @@ CONFIG(debug, debug|release) { } LIBS += $$QTUITOOLS_LINKAGE diff --git a/patches/0033-Fixed-useless-substitution-in-syncqt.patch b/patches/0033-Fixed-useless-substitution-in-syncqt.patch index 8dda471..d7c14f9 100644 --- a/patches/0033-Fixed-useless-substitution-in-syncqt.patch +++ b/patches/0033-Fixed-useless-substitution-in-syncqt.patch @@ -6,13 +6,13 @@ Subject: [PATCH] Fixed useless substitution in syncqt. The substitution is not necessary and messes up the argument that is passed in. --- - qtkernel/bin/syncqt | 1 - + qtbase/bin/syncqt | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) -diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt +diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt index 0894c80..5a72636 100755 ---- a/qtkernel/bin/syncqt -+++ b/qtkernel/bin/syncqt +--- a/qtbase/bin/syncqt ++++ b/qtbase/bin/syncqt @@ -303,7 +303,6 @@ sub syncHeader { ###################################################################### sub fixPaths { diff --git a/patches/0034-Made-syncqt-collapse-redundant-.-sections-in-paths.patch b/patches/0034-Made-syncqt-collapse-redundant-.-sections-in-paths.patch index f39cdda..b85d855 100644 --- a/patches/0034-Made-syncqt-collapse-redundant-.-sections-in-paths.patch +++ b/patches/0034-Made-syncqt-collapse-redundant-.-sections-in-paths.patch @@ -4,13 +4,13 @@ Date: Mon, 3 Jan 2011 19:19:39 +0100 Subject: [PATCH] Made syncqt collapse redundant ".." sections in paths. --- - qtkernel/bin/syncqt | 2 ++ + qtbase/bin/syncqt | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) -diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt +diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt index cffd832..5529359 100755 ---- a/qtkernel/bin/syncqt -+++ b/qtkernel/bin/syncqt +--- a/qtbase/bin/syncqt ++++ b/qtbase/bin/syncqt @@ -323,6 +323,8 @@ sub fixPaths { return basename($file) if($file_dir eq $dir); diff --git a/patches/0035-Made-the-internal-support-for-Qt3Support-in-QtGui-co.patch b/patches/0035-Made-the-internal-support-for-Qt3Support-in-QtGui-co.patch index 57783fd..aa8bb3b 100644 --- a/patches/0035-Made-the-internal-support-for-Qt3Support-in-QtGui-co.patch +++ b/patches/0035-Made-the-internal-support-for-Qt3Support-in-QtGui-co.patch @@ -4,14 +4,14 @@ Date: Mon, 3 Jan 2011 22:54:07 +0100 Subject: [PATCH] Made the internal support for Qt3Support in QtGui compile. --- - qtkernel/src/qbase.pri | 2 +- - qtkernel/src/tools/uic/uic.pro | 2 +- + qtbase/src/qbase.pri | 2 +- + qtbase/src/tools/uic/uic.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/qtkernel/src/qbase.pri b/qtkernel/src/qbase.pri +diff --git a/qtbase/src/qbase.pri b/qtbase/src/qbase.pri index f8ababb..a875a56 100644 ---- a/qtkernel/src/qbase.pri -+++ b/qtkernel/src/qbase.pri +--- a/qtbase/src/qbase.pri ++++ b/qtbase/src/qbase.pri @@ -166,7 +166,7 @@ win32-g++* { contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE @@ -21,10 +21,10 @@ index f8ababb..a875a56 100644 DEFINES *= QT_MOC_COMPAT #we don't need warnings from calling moc code in our generated code DEFINES *= QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION -diff --git a/qtkernel/src/tools/uic/uic.pro b/qtkernel/src/tools/uic/uic.pro +diff --git a/qtbase/src/tools/uic/uic.pro b/qtbase/src/tools/uic/uic.pro index 9b63d42..591925c 100644 ---- a/qtkernel/src/tools/uic/uic.pro -+++ b/qtkernel/src/tools/uic/uic.pro +--- a/qtbase/src/tools/uic/uic.pro ++++ b/qtbase/src/tools/uic/uic.pro @@ -6,7 +6,7 @@ DEFINES += QT_UIC INCLUDEPATH += . DEPENDPATH += . diff --git a/patches/0036-Made-modules-that-depend-on-other-modules-add-their-.patch b/patches/0036-Made-modules-that-depend-on-other-modules-add-their-.patch index 7a86175..ca93d54 100644 --- a/patches/0036-Made-modules-that-depend-on-other-modules-add-their-.patch +++ b/patches/0036-Made-modules-that-depend-on-other-modules-add-their-.patch @@ -9,13 +9,13 @@ well. RevBy: axis --- - qtkernel/mkspecs/features/qt.prf | 6 ++++++ + qtbase/mkspecs/features/qt.prf | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) -diff --git a/qtkernel/mkspecs/features/qt.prf b/qtkernel/mkspecs/features/qt.prf +diff --git a/qtbase/mkspecs/features/qt.prf b/qtbase/mkspecs/features/qt.prf index 3b9c645..c1584fc 100644 ---- a/qtkernel/mkspecs/features/qt.prf -+++ b/qtkernel/mkspecs/features/qt.prf +--- a/qtbase/mkspecs/features/qt.prf ++++ b/qtbase/mkspecs/features/qt.prf @@ -124,6 +124,7 @@ QMAKE_LIBDIR += $$QMAKE_LIBDIR_QT # Topological ordering of modules based on their QT.<module>.depends variable diff --git a/patches/0037-Make-each-module-refer-to-its-own-bin.patch b/patches/0037-Make-each-module-refer-to-its-own-bin.patch index 0046cf5..4f95620 100644 --- a/patches/0037-Make-each-module-refer-to-its-own-bin.patch +++ b/patches/0037-Make-each-module-refer-to-its-own-bin.patch @@ -10,17 +10,17 @@ pri file, so others can use their applications --- phonon/modules/qt_phonon.pri | 1 + qt3support/modules/qt_qt3support.pri | 1 + - qtkernel/bin/syncqt | 1 + - qtkernel/mkspecs/features/qt_config.prf | 1 + - qtkernel/mkspecs/features/qt_functions.prf | 9 ++++++--- - qtkernel/src/modules/qt_core.pri | 1 + - qtkernel/src/modules/qt_dbus.pri | 1 + - qtkernel/src/modules/qt_network.pri | 1 + - qtkernel/src/modules/qt_opengl.pri | 1 + - qtkernel/src/modules/qt_openvg.pri | 1 + - qtkernel/src/modules/qt_sql.pri | 1 + - qtkernel/src/modules/qt_testlib.pri | 1 + - qtkernel/src/modules/qt_xml.pri | 1 + + qtbase/bin/syncqt | 1 + + qtbase/mkspecs/features/qt_config.prf | 1 + + qtbase/mkspecs/features/qt_functions.prf | 9 ++++++--- + qtbase/src/modules/qt_core.pri | 1 + + qtbase/src/modules/qt_dbus.pri | 1 + + qtbase/src/modules/qt_network.pri | 1 + + qtbase/src/modules/qt_opengl.pri | 1 + + qtbase/src/modules/qt_openvg.pri | 1 + + qtbase/src/modules/qt_sql.pri | 1 + + qtbase/src/modules/qt_testlib.pri | 1 + + qtbase/src/modules/qt_xml.pri | 1 + qtdeclarative/modules/qt_declarative.pri | 1 + qtscript/modules/qt_script.pri | 1 + qtscript/modules/qt_scripttools.pri | 1 + @@ -54,22 +54,22 @@ index 06754db..e2526f8 100644 QT.qt3support.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/Qt3Support QT.qt3support.private_includes = $$QT_MODULE_INCLUDE_BASE/Qt3Support/private QT.qt3support.sources = $$QT_MODULE_BASE/src/qt3support -diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt +diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt index 2dcbaf3..0433240 100755 ---- a/qtkernel/bin/syncqt -+++ b/qtkernel/bin/syncqt +--- a/qtbase/bin/syncqt ++++ b/qtbase/bin/syncqt @@ -1006,6 +1006,7 @@ foreach my $lib (@modules_to_sync) { - my $moduleprifwd = "$qtkerneldir/mkspecs/modules/$modulepriname"; + my $moduleprifwd = "$qtbasedir/mkspecs/modules/$modulepriname"; open MODULE_PRI_FILE, ">$moduleprifwd"; print MODULE_PRI_FILE "QT_MODULE_BASE = $basedir\n"; + print MODULE_PRI_FILE "QT_MODULE_BIN_BASE = $out_basedir/bin\n"; print MODULE_PRI_FILE "QT_MODULE_INCLUDE_BASE = $out_basedir/include\n"; print MODULE_PRI_FILE "QT_MODULE_LIB_BASE = $out_basedir/lib\n"; print MODULE_PRI_FILE "include($modulepri)\n"; -diff --git a/qtkernel/mkspecs/features/qt_config.prf b/qtkernel/mkspecs/features/qt_config.prf +diff --git a/qtbase/mkspecs/features/qt_config.prf b/qtbase/mkspecs/features/qt_config.prf index 2973c7e..7e80ad3 100644 ---- a/qtkernel/mkspecs/features/qt_config.prf -+++ b/qtkernel/mkspecs/features/qt_config.prf +--- a/qtbase/mkspecs/features/qt_config.prf ++++ b/qtbase/mkspecs/features/qt_config.prf @@ -20,6 +20,7 @@ isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) { # qt_<module>.pri forwarding file QT_MODULE_INCLUDE_BASE = $$[QT_INSTALL_HEADERS] @@ -78,10 +78,10 @@ index 2973c7e..7e80ad3 100644 include($$mod) } } -diff --git a/qtkernel/mkspecs/features/qt_functions.prf b/qtkernel/mkspecs/features/qt_functions.prf +diff --git a/qtbase/mkspecs/features/qt_functions.prf b/qtbase/mkspecs/features/qt_functions.prf index 9182f87..a145b9d 100644 ---- a/qtkernel/mkspecs/features/qt_functions.prf -+++ b/qtkernel/mkspecs/features/qt_functions.prf +--- a/qtbase/mkspecs/features/qt_functions.prf ++++ b/qtbase/mkspecs/features/qt_functions.prf @@ -157,10 +157,13 @@ defineTest(qtAddModule) { # variable, default @@ -99,10 +99,10 @@ index 9182f87..a145b9d 100644 $$1 ~= s,[/\\\\],$$QMAKE_DIR_SEP, contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { exists($$eval($$1).bat) { -diff --git a/qtkernel/src/modules/qt_core.pri b/qtkernel/src/modules/qt_core.pri +diff --git a/qtbase/src/modules/qt_core.pri b/qtbase/src/modules/qt_core.pri index 494f96f..99f3fa6 100644 ---- a/qtkernel/src/modules/qt_core.pri -+++ b/qtkernel/src/modules/qt_core.pri +--- a/qtbase/src/modules/qt_core.pri ++++ b/qtbase/src/modules/qt_core.pri @@ -4,6 +4,7 @@ QT_CORE_MINOR_VERSION = $$QT_MINOR_VERSION QT_CORE_PATCH_VERSION = $$QT_PATCH_VERSION @@ -111,10 +111,10 @@ index 494f96f..99f3fa6 100644 QT.core.includes = $$QT_MODULE_INCLUDE_BASE/QtCore QT.core.private_includes = $$QT_MODULE_INCLUDE_BASE/QtCore/private QT.core.sources = $$QT_MODULE_BASE/src/corelib -diff --git a/qtkernel/src/modules/qt_dbus.pri b/qtkernel/src/modules/qt_dbus.pri +diff --git a/qtbase/src/modules/qt_dbus.pri b/qtbase/src/modules/qt_dbus.pri index 73fdf99..74949b1 100644 ---- a/qtkernel/src/modules/qt_dbus.pri -+++ b/qtkernel/src/modules/qt_dbus.pri +--- a/qtbase/src/modules/qt_dbus.pri ++++ b/qtbase/src/modules/qt_dbus.pri @@ -4,6 +4,7 @@ QT_DBUS_MINOR_VERSION = $$QT_MINOR_VERSION QT_DBUS_PATCH_VERSION = $$QT_PATCH_VERSION @@ -123,10 +123,10 @@ index 73fdf99..74949b1 100644 QT.dbus.includes = $$QT_MODULE_INCLUDE_BASE/QtDBus QT.dbus.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDBus/private QT.dbus.sources = $$QT_MODULE_BASE/src/dbus -diff --git a/qtkernel/src/modules/qt_network.pri b/qtkernel/src/modules/qt_network.pri +diff --git a/qtbase/src/modules/qt_network.pri b/qtbase/src/modules/qt_network.pri index c8b1f00..37c941b 100644 ---- a/qtkernel/src/modules/qt_network.pri -+++ b/qtkernel/src/modules/qt_network.pri +--- a/qtbase/src/modules/qt_network.pri ++++ b/qtbase/src/modules/qt_network.pri @@ -4,6 +4,7 @@ QT_NETWORK_MINOR_VERSION = $$QT_MINOR_VERSION QT_NETWORK_PATCH_VERSION = $$QT_PATCH_VERSION @@ -135,10 +135,10 @@ index c8b1f00..37c941b 100644 QT.network.includes = $$QT_MODULE_INCLUDE_BASE/QtNetwork QT.network.private_includes = $$QT_MODULE_INCLUDE_BASE/QtNetwork/private QT.network.sources = $$QT_MODULE_BASE/src/network -diff --git a/qtkernel/src/modules/qt_opengl.pri b/qtkernel/src/modules/qt_opengl.pri +diff --git a/qtbase/src/modules/qt_opengl.pri b/qtbase/src/modules/qt_opengl.pri index eb47b00..0bd0df7 100644 ---- a/qtkernel/src/modules/qt_opengl.pri -+++ b/qtkernel/src/modules/qt_opengl.pri +--- a/qtbase/src/modules/qt_opengl.pri ++++ b/qtbase/src/modules/qt_opengl.pri @@ -4,6 +4,7 @@ QT_OPENGL_MINOR_VERSION = $$QT_MINOR_VERSION QT_OPENGL_PATCH_VERSION = $$QT_PATCH_VERSION @@ -147,10 +147,10 @@ index eb47b00..0bd0df7 100644 QT.opengl.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenGL QT.opengl.private_includes = $$QT_MODULE_INCLUDE_BASE/QtOpenGL/private QT.opengl.sources = $$QT_MODULE_BASE/src/opengl -diff --git a/qtkernel/src/modules/qt_openvg.pri b/qtkernel/src/modules/qt_openvg.pri +diff --git a/qtbase/src/modules/qt_openvg.pri b/qtbase/src/modules/qt_openvg.pri index 09811ba..9a3ef8b 100644 ---- a/qtkernel/src/modules/qt_openvg.pri -+++ b/qtkernel/src/modules/qt_openvg.pri +--- a/qtbase/src/modules/qt_openvg.pri ++++ b/qtbase/src/modules/qt_openvg.pri @@ -4,6 +4,7 @@ QT_OPENVG_MINOR_VERSION = $$QT_MINOR_VERSION QT_OPENVG_PATCH_VERSION = $$QT_PATCH_VERSION @@ -159,10 +159,10 @@ index 09811ba..9a3ef8b 100644 QT.openvg.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenVG QT.openvg.private_includes = $$QT_MODULE_INCLUDE_BASE/QtOpenVG/private QT.openvg.sources = $$QT_MODULE_BASE/src/openvg -diff --git a/qtkernel/src/modules/qt_sql.pri b/qtkernel/src/modules/qt_sql.pri +diff --git a/qtbase/src/modules/qt_sql.pri b/qtbase/src/modules/qt_sql.pri index 42dde1b..d9b856e 100644 ---- a/qtkernel/src/modules/qt_sql.pri -+++ b/qtkernel/src/modules/qt_sql.pri +--- a/qtbase/src/modules/qt_sql.pri ++++ b/qtbase/src/modules/qt_sql.pri @@ -4,6 +4,7 @@ QT_SQL_MINOR_VERSION = $$QT_MINOR_VERSION QT_SQL_PATCH_VERSION = $$QT_PATCH_VERSION @@ -171,10 +171,10 @@ index 42dde1b..d9b856e 100644 QT.sql.includes = $$QT_MODULE_INCLUDE_BASE/QtSql QT.sql.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSql/private QT.sql.sources = $$QT_MODULE_BASE/src/sql -diff --git a/qtkernel/src/modules/qt_testlib.pri b/qtkernel/src/modules/qt_testlib.pri +diff --git a/qtbase/src/modules/qt_testlib.pri b/qtbase/src/modules/qt_testlib.pri index 5971808..7e9ca09 100644 ---- a/qtkernel/src/modules/qt_testlib.pri -+++ b/qtkernel/src/modules/qt_testlib.pri +--- a/qtbase/src/modules/qt_testlib.pri ++++ b/qtbase/src/modules/qt_testlib.pri @@ -4,6 +4,7 @@ QT_TEST_MINOR_VERSION = $$QT_MINOR_VERSION QT_TEST_PATCH_VERSION = $$QT_PATCH_VERSION @@ -183,10 +183,10 @@ index 5971808..7e9ca09 100644 QT.testlib.includes = $$QT_MODULE_INCLUDE_BASE/QtTest QT.testlib.private_includes = $$QT_MODULE_INCLUDE_BASE/QtTest/private QT.testlib.sources = $$QT_MODULE_BASE/src/testlib -diff --git a/qtkernel/src/modules/qt_xml.pri b/qtkernel/src/modules/qt_xml.pri +diff --git a/qtbase/src/modules/qt_xml.pri b/qtbase/src/modules/qt_xml.pri index c0c630c..c967cd7 100644 ---- a/qtkernel/src/modules/qt_xml.pri -+++ b/qtkernel/src/modules/qt_xml.pri +--- a/qtbase/src/modules/qt_xml.pri ++++ b/qtbase/src/modules/qt_xml.pri @@ -4,6 +4,7 @@ QT_XML_MINOR_VERSION = $$QT_MINOR_VERSION QT_XML_PATCH_VERSION = $$QT_PATCH_VERSION diff --git a/patches/0039-examples.pro-removed-moved-subdirectories.patch b/patches/0039-examples.pro-removed-moved-subdirectories.patch index aaae52a..031eff7 100644 --- a/patches/0039-examples.pro-removed-moved-subdirectories.patch +++ b/patches/0039-examples.pro-removed-moved-subdirectories.patch @@ -4,13 +4,13 @@ Date: Fri, 7 Jan 2011 13:46:25 +0100 Subject: [PATCH] examples.pro removed moved subdirectories --- - qtkernel/examples/examples.pro | 6 ------ + qtbase/examples/examples.pro | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) -diff --git a/qtkernel/examples/examples.pro b/qtkernel/examples/examples.pro +diff --git a/qtbase/examples/examples.pro b/qtbase/examples/examples.pro index f8294c4..ec0c1b0 100644 ---- a/qtkernel/examples/examples.pro -+++ b/qtkernel/examples/examples.pro +--- a/qtbase/examples/examples.pro ++++ b/qtbase/examples/examples.pro @@ -50,9 +50,6 @@ symbian: SUBDIRS = \ SUBDIRS += multimedia } diff --git a/patches/0041-Make-auto-test-build.patch b/patches/0041-Make-auto-test-build.patch index ee54cc8..437df42 100644 --- a/patches/0041-Make-auto-test-build.patch +++ b/patches/0041-Make-auto-test-build.patch @@ -9,7 +9,7 @@ Subject: [PATCH] Make auto test build .../tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp | 2 +- .../auto/q3sqlselectcursor/q3sqlselectcursor.pro | 2 ++ .../q3sqlselectcursor/tst_q3sqlselectcursor.cpp | 2 +- - qtkernel/tests/auto/auto.pro | 10 ---------- + qtbase/tests/auto/auto.pro | 10 ---------- .../tests/auto/declarative/examples/examples.pro | 2 +- .../qdeclarativesqldatabase.pro | 2 +- .../qdeclarativeviewer/qdeclarativeviewer.pro | 2 +- @@ -79,10 +79,10 @@ index a5eecde..2ac7e80 100644 //TESTED_FILES= -diff --git a/qtkernel/tests/auto/auto.pro b/qtkernel/tests/auto/auto.pro +diff --git a/qtbase/tests/auto/auto.pro b/qtbase/tests/auto/auto.pro index c677249..02e8b5b 100644 ---- a/qtkernel/tests/auto/auto.pro -+++ b/qtkernel/tests/auto/auto.pro +--- a/qtbase/tests/auto/auto.pro ++++ b/qtbase/tests/auto/auto.pro @@ -9,15 +9,5 @@ SUBDIRS += \ other.pro diff --git a/patches/0042-Demos-activate-in-profiles.patch b/patches/0042-Demos-activate-in-profiles.patch index da4f1a8..99b5f92 100644 --- a/patches/0042-Demos-activate-in-profiles.patch +++ b/patches/0042-Demos-activate-in-profiles.patch @@ -4,13 +4,13 @@ Date: Fri, 7 Jan 2011 16:49:50 +0100 Subject: [PATCH] Demos: activate in profiles --- - qtkernel/demos/demos.pro | 9 --------- + qtbase/demos/demos.pro | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) -diff --git a/qtkernel/demos/demos.pro b/qtkernel/demos/demos.pro +diff --git a/qtbase/demos/demos.pro b/qtbase/demos/demos.pro index e6a5cfb..fd5dabf 100644 ---- a/qtkernel/demos/demos.pro -+++ b/qtkernel/demos/demos.pro +--- a/qtbase/demos/demos.pro ++++ b/qtbase/demos/demos.pro @@ -55,10 +55,6 @@ contains(QT_BUILD_PARTS, tools):{ wince*:SUBDIRS += demos_sqlbrowser } diff --git a/patches/0044-Move-uitools-from-QtTools-to-QtKernel.patch b/patches/0044-Move-uitools-from-QtTools-to-QtBase.patch index 065d7cd..8a6df1e 100644 --- a/patches/0044-Move-uitools-from-QtTools-to-QtKernel.patch +++ b/patches/0044-Move-uitools-from-QtTools-to-QtBase.patch @@ -1,22 +1,22 @@ From 74f482bbec19409d124552ccdf4e35bbc325eb1d Mon Sep 17 00:00:00 2001 From: Liang Qi <liang.qi@nokia.com> Date: Wed, 12 Jan 2011 21:06:11 +0100 -Subject: [PATCH] Move uitools from QtTools to QtKernel +Subject: [PATCH] Move uitools from QtTools to QtBase --- - qtkernel/src/modules/qt_uilib.pri | 12 +++ - {qttools => qtkernel/src}/modules/qt_uitools.pri | 4 +- - qtkernel/src/src.pro | 5 +- - qtkernel/src/uitools/uitools.pro | 12 +- - qtkernel/sync.profile | 6 + - qtkernel/tools/uilib/abstractformbuilder.h | 2 +- - qtkernel/tools/uilib/customwidget.h | 2 +- - qtkernel/tools/uilib/extension.h | 109 +++++++++++++++++++++ - qtkernel/tools/uilib/formbuilder.h | 4 +- - qtkernel/tools/uilib/formscriptrunner_p.h | 2 +- - qtkernel/tools/uilib/properties_p.h | 2 +- - qtkernel/tools/uilib/resourcebuilder_p.h | 2 +- - qtkernel/tools/uilib/textbuilder_p.h | 2 +- + qtbase/src/modules/qt_uilib.pri | 12 +++ + {qttools => qtbase/src}/modules/qt_uitools.pri | 4 +- + qtbase/src/src.pro | 5 +- + qtbase/src/uitools/uitools.pro | 12 +- + qtbase/sync.profile | 6 + + qtbase/tools/uilib/abstractformbuilder.h | 2 +- + qtbase/tools/uilib/customwidget.h | 2 +- + qtbase/tools/uilib/extension.h | 109 +++++++++++++++++++++ + qtbase/tools/uilib/formbuilder.h | 4 +- + qtbase/tools/uilib/formscriptrunner_p.h | 2 +- + qtbase/tools/uilib/properties_p.h | 2 +- + qtbase/tools/uilib/resourcebuilder_p.h | 2 +- + qtbase/tools/uilib/textbuilder_p.h | 2 +- qttools/src/designer/src/components/component.pri | 3 +- qttools/src/designer/src/components/lib/lib.pro | 2 +- qttools/src/designer/src/designer/designer.pro | 2 +- @@ -25,15 +25,15 @@ Subject: [PATCH] Move uitools from QtTools to QtKernel qttools/src/linguist/linguist/linguist.pro | 6 +- qttools/sync.profile | 2 - 20 files changed, 156 insertions(+), 29 deletions(-) - create mode 100644 qtkernel/src/modules/qt_uilib.pri - rename {qttools => qtkernel/src}/modules/qt_uitools.pri (75%) - create mode 100644 qtkernel/tools/uilib/extension.h + create mode 100644 qtbase/src/modules/qt_uilib.pri + rename {qttools => qtbase/src}/modules/qt_uitools.pri (75%) + create mode 100644 qtbase/tools/uilib/extension.h -diff --git a/qtkernel/src/modules/qt_uilib.pri b/qtkernel/src/modules/qt_uilib.pri +diff --git a/qtbase/src/modules/qt_uilib.pri b/qtbase/src/modules/qt_uilib.pri new file mode 100644 index 0000000..0e143de --- /dev/null -+++ b/qtkernel/src/modules/qt_uilib.pri ++++ b/qtbase/src/modules/qt_uilib.pri @@ -0,0 +1,12 @@ +QT_UILIB_VERSION = $$QT_VERSION +QT_UILIB_MAJOR_VERSION = $$QT_MAJOR_VERSION @@ -47,13 +47,13 @@ index 0000000..0e143de +QT.uilib.sources = $$QT_MODULE_BASE/tools/uilib +QT.uilib.libs = $$QT_MODULE_LIB_BASE +QT.uilib.depends = xml -diff --git a/qttools/modules/qt_uitools.pri b/qtkernel/src/modules/qt_uitools.pri +diff --git a/qttools/modules/qt_uitools.pri b/qtbase/src/modules/qt_uitools.pri similarity index 75% rename from qttools/modules/qt_uitools.pri -rename to qtkernel/src/modules/qt_uitools.pri +rename to qtbase/src/modules/qt_uitools.pri index c5160c5..1f4070c 100644 --- a/qttools/modules/qt_uitools.pri -+++ b/qtkernel/src/modules/qt_uitools.pri ++++ b/qtbase/src/modules/qt_uitools.pri @@ -5,9 +5,9 @@ QT_UITOOLS_PATCH_VERSION = $$QT_PATCH_VERSION QT.uitools.name = QtUiTools @@ -66,10 +66,10 @@ index c5160c5..1f4070c 100644 QT.uitools.libs = $$QT_MODULE_LIB_BASE QT.uitools.depends = xml QT.uitools.DEFINES = QT_UITOOLS_LIB -diff --git a/qtkernel/src/src.pro b/qtkernel/src/src.pro +diff --git a/qtbase/src/src.pro b/qtbase/src/src.pro index 2f65a08..cd4b7f7 100644 ---- a/qtkernel/src/src.pro -+++ b/qtkernel/src/src.pro +--- a/qtbase/src/src.pro ++++ b/qtbase/src/src.pro @@ -4,7 +4,7 @@ TEMPLATE = subdirs unset(SRC_SUBDIRS) win32:SRC_SUBDIRS += src_winmain @@ -96,10 +96,10 @@ index 2f65a08..cd4b7f7 100644 src_dbus.depends = src_corelib src_xml src_network.depends = src_corelib src_opengl.depends = src_gui -diff --git a/qtkernel/src/uitools/uitools.pro b/qtkernel/src/uitools/uitools.pro +diff --git a/qtbase/src/uitools/uitools.pro b/qtbase/src/uitools/uitools.pro index be46afc..07114a4 100644 ---- a/qtkernel/src/uitools/uitools.pro -+++ b/qtkernel/src/uitools/uitools.pro +--- a/qtbase/src/uitools/uitools.pro ++++ b/qtbase/src/uitools/uitools.pro @@ -1,9 +1,9 @@ +MODULE = uitools +QPRO_PWD = $$PWD @@ -128,10 +128,10 @@ index be46afc..07114a4 100644 HEADERS += quiloader.h SOURCES += quiloader.cpp -diff --git a/qtkernel/sync.profile b/qtkernel/sync.profile +diff --git a/qtbase/sync.profile b/qtbase/sync.profile index 7984329..9631d22 100644 ---- a/qtkernel/sync.profile -+++ b/qtkernel/sync.profile +--- a/qtbase/sync.profile ++++ b/qtbase/sync.profile @@ -8,6 +8,8 @@ "QtNetwork" => "$basedir/src/network", "QtTest" => "$basedir/src/testlib", @@ -159,10 +159,10 @@ index 7984329..9631d22 100644 ); @ignore_for_master_contents = ( "qt.h", "qpaintdevicedefs.h" ); -diff --git a/qtkernel/tools/uilib/abstractformbuilder.h b/qtkernel/tools/uilib/abstractformbuilder.h +diff --git a/qtbase/tools/uilib/abstractformbuilder.h b/qtbase/tools/uilib/abstractformbuilder.h index b76f0e4..2f99b36 100644 ---- a/qtkernel/tools/uilib/abstractformbuilder.h -+++ b/qtkernel/tools/uilib/abstractformbuilder.h +--- a/qtbase/tools/uilib/abstractformbuilder.h ++++ b/qtbase/tools/uilib/abstractformbuilder.h @@ -42,7 +42,7 @@ #ifndef ABSTRACTFORMBUILDER_H #define ABSTRACTFORMBUILDER_H @@ -172,10 +172,10 @@ index b76f0e4..2f99b36 100644 #include <QtCore/QList> #include <QtCore/QHash> -diff --git a/qtkernel/tools/uilib/customwidget.h b/qtkernel/tools/uilib/customwidget.h +diff --git a/qtbase/tools/uilib/customwidget.h b/qtbase/tools/uilib/customwidget.h index 52c2342..0a04c93 100644 ---- a/qtkernel/tools/uilib/customwidget.h -+++ b/qtkernel/tools/uilib/customwidget.h +--- a/qtbase/tools/uilib/customwidget.h ++++ b/qtbase/tools/uilib/customwidget.h @@ -42,7 +42,7 @@ #ifndef CUSTOMWIDGET_H #define CUSTOMWIDGET_H @@ -185,11 +185,11 @@ index 52c2342..0a04c93 100644 #include <QtCore/QObject> #include <QtCore/QString> #include <QtGui/QIcon> -diff --git a/qtkernel/tools/uilib/extension.h b/qtkernel/tools/uilib/extension.h +diff --git a/qtbase/tools/uilib/extension.h b/qtbase/tools/uilib/extension.h new file mode 100644 index 0000000..d13e517 --- /dev/null -+++ b/qtkernel/tools/uilib/extension.h ++++ b/qtbase/tools/uilib/extension.h @@ -0,0 +1,109 @@ +/**************************************************************************** +** @@ -300,10 +300,10 @@ index 0000000..d13e517 +QT_END_HEADER + +#endif // EXTENSION_H -diff --git a/qtkernel/tools/uilib/formbuilder.h b/qtkernel/tools/uilib/formbuilder.h +diff --git a/qtbase/tools/uilib/formbuilder.h b/qtbase/tools/uilib/formbuilder.h index 01aeb16..1d3dc5a 100644 ---- a/qtkernel/tools/uilib/formbuilder.h -+++ b/qtkernel/tools/uilib/formbuilder.h +--- a/qtbase/tools/uilib/formbuilder.h ++++ b/qtbase/tools/uilib/formbuilder.h @@ -42,8 +42,8 @@ #ifndef FORMBUILDER_H #define FORMBUILDER_H @@ -315,10 +315,10 @@ index 01aeb16..1d3dc5a 100644 #include <QtCore/QStringList> #include <QtCore/QMap> -diff --git a/qtkernel/tools/uilib/formscriptrunner_p.h b/qtkernel/tools/uilib/formscriptrunner_p.h +diff --git a/qtbase/tools/uilib/formscriptrunner_p.h b/qtbase/tools/uilib/formscriptrunner_p.h index 117b4e8..c13bd4c 100644 ---- a/qtkernel/tools/uilib/formscriptrunner_p.h -+++ b/qtkernel/tools/uilib/formscriptrunner_p.h +--- a/qtbase/tools/uilib/formscriptrunner_p.h ++++ b/qtbase/tools/uilib/formscriptrunner_p.h @@ -53,7 +53,7 @@ // We mean it. // @@ -328,10 +328,10 @@ index 117b4e8..c13bd4c 100644 #include <QtCore/QList> #include <QtCore/QFlags> #include <QtCore/QString> -diff --git a/qtkernel/tools/uilib/properties_p.h b/qtkernel/tools/uilib/properties_p.h +diff --git a/qtbase/tools/uilib/properties_p.h b/qtbase/tools/uilib/properties_p.h index 5f40f87..e57f9ed 100644 ---- a/qtkernel/tools/uilib/properties_p.h -+++ b/qtkernel/tools/uilib/properties_p.h +--- a/qtbase/tools/uilib/properties_p.h ++++ b/qtbase/tools/uilib/properties_p.h @@ -53,7 +53,7 @@ #ifndef UILIBPROPERTIES_H #define UILIBPROPERTIES_H @@ -341,10 +341,10 @@ index 5f40f87..e57f9ed 100644 #include <QtCore/QObject> #include <QtCore/QMetaProperty> -diff --git a/qtkernel/tools/uilib/resourcebuilder_p.h b/qtkernel/tools/uilib/resourcebuilder_p.h +diff --git a/qtbase/tools/uilib/resourcebuilder_p.h b/qtbase/tools/uilib/resourcebuilder_p.h index a3ccbf8..549d816 100644 ---- a/qtkernel/tools/uilib/resourcebuilder_p.h -+++ b/qtkernel/tools/uilib/resourcebuilder_p.h +--- a/qtbase/tools/uilib/resourcebuilder_p.h ++++ b/qtbase/tools/uilib/resourcebuilder_p.h @@ -53,7 +53,7 @@ // We mean it. // @@ -354,10 +354,10 @@ index a3ccbf8..549d816 100644 #include <QtCore/QList> #include <QtCore/QString> -diff --git a/qtkernel/tools/uilib/textbuilder_p.h b/qtkernel/tools/uilib/textbuilder_p.h +diff --git a/qtbase/tools/uilib/textbuilder_p.h b/qtbase/tools/uilib/textbuilder_p.h index 8da296d..066733c 100644 ---- a/qtkernel/tools/uilib/textbuilder_p.h -+++ b/qtkernel/tools/uilib/textbuilder_p.h +--- a/qtbase/tools/uilib/textbuilder_p.h ++++ b/qtbase/tools/uilib/textbuilder_p.h @@ -53,7 +53,7 @@ // We mean it. // diff --git a/patches/0046-Use-correct-DESTDIR-for-UiTools.patch b/patches/0046-Use-correct-DESTDIR-for-UiTools.patch index d26d317..5fa0b8d 100644 --- a/patches/0046-Use-correct-DESTDIR-for-UiTools.patch +++ b/patches/0046-Use-correct-DESTDIR-for-UiTools.patch @@ -4,13 +4,13 @@ Date: Fri, 14 Jan 2011 14:42:12 +0100 Subject: [PATCH] Use correct DESTDIR for UiTools. --- - qtkernel/src/uitools/uitools.pro | 1 + + qtbase/src/uitools/uitools.pro | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) -diff --git a/qtkernel/src/uitools/uitools.pro b/qtkernel/src/uitools/uitools.pro +diff --git a/qtbase/src/uitools/uitools.pro b/qtbase/src/uitools/uitools.pro index abc4022..ec82f6e 100644 ---- a/qtkernel/src/uitools/uitools.pro -+++ b/qtkernel/src/uitools/uitools.pro +--- a/qtbase/src/uitools/uitools.pro ++++ b/qtbase/src/uitools/uitools.pro @@ -4,6 +4,7 @@ TEMPLATE = lib TARGET = $$qtLibraryTarget(QtUiTools) QT = core xml diff --git a/patches/0048-Add-QMAKESPEC_ORIGINAL-to-the-INCLUDEPATH-when-neede.patch b/patches/0048-Add-QMAKESPEC_ORIGINAL-to-the-INCLUDEPATH-when-neede.patch index fac9fd7..c6aa4b4 100644 --- a/patches/0048-Add-QMAKESPEC_ORIGINAL-to-the-INCLUDEPATH-when-neede.patch +++ b/patches/0048-Add-QMAKESPEC_ORIGINAL-to-the-INCLUDEPATH-when-neede.patch @@ -4,19 +4,19 @@ Date: Fri, 14 Jan 2011 21:35:58 -0600 Subject: [PATCH] Add QMAKESPEC_ORIGINAL to the INCLUDEPATH when needed --- - qtkernel/mkspecs/features/qt.prf | 5 +++++ + qtbase/mkspecs/features/qt.prf | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) -diff --git a/qtkernel/mkspecs/features/qt.prf b/qtkernel/mkspecs/features/qt.prf +diff --git a/qtbase/mkspecs/features/qt.prf b/qtbase/mkspecs/features/qt.prf index c1584fc..c9b4205 100644 ---- a/qtkernel/mkspecs/features/qt.prf -+++ b/qtkernel/mkspecs/features/qt.prf +--- a/qtbase/mkspecs/features/qt.prf ++++ b/qtbase/mkspecs/features/qt.prf @@ -11,6 +11,11 @@ win32 { } contains(DEFINES, QT_MAKEDLL)|contains(DEFINES, QT_DLL):QMAKE_QT_DLL = 1 } + # Some files include qplatformdefs.h, which lives in the individual mkspec directory -+ # However, if QMAKESPEC_ORIGINAL is set, the module/app is outside of the QtKernel ++ # However, if QMAKESPEC_ORIGINAL is set, the module/app is outside of the QtBase + # directory, and using the default profile. So we add the original mkspecs directory + # to the include path + !isEmpty(QMAKESPEC_ORIGINAL):INCLUDEPATH += $$QMAKESPEC_ORIGINAL diff --git a/patches/0049-Remove-hardcoded-modules-in-configure-and-QT_CONFIG.patch b/patches/0049-Remove-hardcoded-modules-in-configure-and-QT_CONFIG.patch index 64b9cb0..be7c785 100644 --- a/patches/0049-Remove-hardcoded-modules-in-configure-and-QT_CONFIG.patch +++ b/patches/0049-Remove-hardcoded-modules-in-configure-and-QT_CONFIG.patch @@ -8,13 +8,13 @@ Also, turning on/off qt3support-functions in core. - Fix QT_BUILD_PARTS for configure.exe --- - qtkernel/tools/configure/configureapp.cpp | 132 ++++++++++++++--------------- + qtbase/tools/configure/configureapp.cpp | 132 ++++++++++++++--------------- 1 files changed, 65 insertions(+), 67 deletions(-) -diff --git a/qtkernel/tools/configure/configureapp.cpp b/qtkernel/tools/configure/configureapp.cpp +diff --git a/qtbase/tools/configure/configureapp.cpp b/qtbase/tools/configure/configureapp.cpp index bf0925e..2f64957 100644 ---- a/qtkernel/tools/configure/configureapp.cpp -+++ b/qtkernel/tools/configure/configureapp.cpp +--- a/qtbase/tools/configure/configureapp.cpp ++++ b/qtbase/tools/configure/configureapp.cpp @@ -188,7 +188,7 @@ Configure::Configure(int& argc, char** argv) if (syncqt_bat.open(QFile::WriteOnly)) { QTextStream stream(&syncqt_bat); diff --git a/patches/0050-New-configure.exe-binary.patch b/patches/0050-New-configure.exe-binary.patch index a893efe..96447cc 100644 --- a/patches/0050-New-configure.exe-binary.patch +++ b/patches/0050-New-configure.exe-binary.patch @@ -4,11 +4,11 @@ Date: Fri, 14 Jan 2011 22:25:12 -0600 Subject: [PATCH] New configure.exe binary --- - qtkernel/configure.exe | Bin 1326592 -> 1395712 bytes + qtbase/configure.exe | Bin 1326592 -> 1395712 bytes 1 files changed, 0 insertions(+), 0 deletions(-) - mode change 100755 => 100644 qtkernel/configure.exe + mode change 100755 => 100644 qtbase/configure.exe -diff --git a/qtkernel/configure.exe b/qtkernel/configure.exe +diff --git a/qtbase/configure.exe b/qtbase/configure.exe old mode 100755 new mode 100644 index 293d667270c42d5dd294ed7ed70447771c011925..78d7b8213eb0a6e44653bdc0a9553a142ce6e6b1 diff --git a/patches/0055-Fixed-a-bug-in-libdir-handling.patch b/patches/0055-Fixed-a-bug-in-libdir-handling.patch index 521e957..66f57f6 100644 --- a/patches/0055-Fixed-a-bug-in-libdir-handling.patch +++ b/patches/0055-Fixed-a-bug-in-libdir-handling.patch @@ -6,13 +6,13 @@ Subject: [PATCH] Fixed a bug in libdir handling. We need to use QMAKE_LIBDIR instead of QMAKE_LFLAGS and -L, because MSVC does not understand -L. --- - qtkernel/mkspecs/features/qt_functions.prf | 3 ++- + qtbase/mkspecs/features/qt_functions.prf | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) -diff --git a/qtkernel/mkspecs/features/qt_functions.prf b/qtkernel/mkspecs/features/qt_functions.prf +diff --git a/qtbase/mkspecs/features/qt_functions.prf b/qtbase/mkspecs/features/qt_functions.prf index a145b9d..312a0b2 100644 ---- a/qtkernel/mkspecs/features/qt_functions.prf -+++ b/qtkernel/mkspecs/features/qt_functions.prf +--- a/qtbase/mkspecs/features/qt_functions.prf ++++ b/qtbase/mkspecs/features/qt_functions.prf @@ -131,7 +131,7 @@ defineTest(qtAddModule) { isEmpty(LINKAGE) { # Make sure we can link to uninstalled libraries diff --git a/patches/0056-Fixed-wrong-inclusion-of-QtHelp-module.patch b/patches/0056-Fixed-wrong-inclusion-of-QtHelp-module.patch index 5be2e95..7504d9c 100644 --- a/patches/0056-Fixed-wrong-inclusion-of-QtHelp-module.patch +++ b/patches/0056-Fixed-wrong-inclusion-of-QtHelp-module.patch @@ -4,13 +4,13 @@ Date: Mon, 24 Jan 2011 15:52:04 +0100 Subject: [PATCH] Fixed wrong inclusion of QtHelp module. --- - qtkernel/mkspecs/features/help.prf | 3 +-- + qtbase/mkspecs/features/help.prf | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) -diff --git a/qtkernel/mkspecs/features/help.prf b/qtkernel/mkspecs/features/help.prf +diff --git a/qtbase/mkspecs/features/help.prf b/qtbase/mkspecs/features/help.prf index 15685e7..d8ba8c3 100644 ---- a/qtkernel/mkspecs/features/help.prf -+++ b/qtkernel/mkspecs/features/help.prf +--- a/qtbase/mkspecs/features/help.prf ++++ b/qtbase/mkspecs/features/help.prf @@ -1,4 +1,3 @@ -INCLUDEPATH = $$QMAKE_INCDIR_QT/QtHelp $$INCLUDEPATH QT += xml sql diff --git a/patches/0058-Use-the-install_name-linker-flag-on-Mac-for-the-fram.patch b/patches/0058-Use-the-install_name-linker-flag-on-Mac-for-the-fram.patch index 7ed4951..0dc0e25 100644 --- a/patches/0058-Use-the-install_name-linker-flag-on-Mac-for-the-fram.patch +++ b/patches/0058-Use-the-install_name-linker-flag-on-Mac-for-the-fram.patch @@ -3,15 +3,15 @@ From: Prasanth Ullattil <prasanth.ullattil@nokia.com> Date: Tue, 25 Jan 2011 10:08:15 +0100 Subject: [PATCH] Use the 'install_name' linker flag on Mac for the frameworks. -This is required for the frameworks outside the qtkernel module. +This is required for the frameworks outside the qtbase module. --- - qtkernel/mkspecs/features/qt_module.prf | 5 +++++ + qtbase/mkspecs/features/qt_module.prf | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) -diff --git a/qtkernel/mkspecs/features/qt_module.prf b/qtkernel/mkspecs/features/qt_module.prf +diff --git a/qtbase/mkspecs/features/qt_module.prf b/qtbase/mkspecs/features/qt_module.prf index dbe863f..db8d235 100644 ---- a/qtkernel/mkspecs/features/qt_module.prf -+++ b/qtkernel/mkspecs/features/qt_module.prf +--- a/qtbase/mkspecs/features/qt_module.prf ++++ b/qtbase/mkspecs/features/qt_module.prf @@ -14,3 +14,8 @@ isEmpty(QMAKE_QT_MODULE)|!exists($$QMAKE_QT_MODULE) { } else { debug(1, "Loaded qmodule.pri from ($$QMAKE_QT_MODULE)") diff --git a/patches/0060-Use-the-MODULE_LIBS-instead-of-QMAKE_LIBDIR_QT-for-f.patch b/patches/0060-Use-the-MODULE_LIBS-instead-of-QMAKE_LIBDIR_QT-for-f.patch index a8d6460..66976db 100644 --- a/patches/0060-Use-the-MODULE_LIBS-instead-of-QMAKE_LIBDIR_QT-for-f.patch +++ b/patches/0060-Use-the-MODULE_LIBS-instead-of-QMAKE_LIBDIR_QT-for-f.patch @@ -4,13 +4,13 @@ Date: Tue, 25 Jan 2011 14:48:39 +0100 Subject: [PATCH] Use the MODULE_LIBS instead of QMAKE_LIBDIR_QT for frameworks. --- - qtkernel/mkspecs/features/qt_functions.prf | 4 ++-- + qtbase/mkspecs/features/qt_functions.prf | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/qtkernel/mkspecs/features/qt_functions.prf b/qtkernel/mkspecs/features/qt_functions.prf +diff --git a/qtbase/mkspecs/features/qt_functions.prf b/qtbase/mkspecs/features/qt_functions.prf index 312a0b2..96366de 100644 ---- a/qtkernel/mkspecs/features/qt_functions.prf -+++ b/qtkernel/mkspecs/features/qt_functions.prf +--- a/qtbase/mkspecs/features/qt_functions.prf ++++ b/qtbase/mkspecs/features/qt_functions.prf @@ -106,7 +106,7 @@ defineTest(qtAddModule) { unset(LINKAGE) mac { diff --git a/patches/0061-Include-headers.pri-from-the-last-path-in-MODULE_INC.patch b/patches/0061-Include-headers.pri-from-the-last-path-in-MODULE_INC.patch index 69dbfdb..c30fae4 100644 --- a/patches/0061-Include-headers.pri-from-the-last-path-in-MODULE_INC.patch +++ b/patches/0061-Include-headers.pri-from-the-last-path-in-MODULE_INC.patch @@ -4,13 +4,13 @@ Date: Wed, 26 Jan 2011 09:44:09 +0100 Subject: [PATCH] Include headers.pri from the last path in MODULE_INCLUDES --- - qtkernel/src/qbase.pri | 5 ++++- + qtbase/src/qbase.pri | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) -diff --git a/qtkernel/src/qbase.pri b/qtkernel/src/qbase.pri +diff --git a/qtbase/src/qbase.pri b/qtbase/src/qbase.pri index 97f65e4..e428802 100644 ---- a/qtkernel/src/qbase.pri -+++ b/qtkernel/src/qbase.pri +--- a/qtbase/src/qbase.pri ++++ b/qtbase/src/qbase.pri @@ -16,7 +16,10 @@ isEmpty(QT_MAJOR_VERSION) { #load up the headers info diff --git a/patches/0065-Changed-path-references-to-ActiveQt.patch b/patches/0065-Changed-path-references-to-ActiveQt.patch index c2af3cc..fd27886 100644 --- a/patches/0065-Changed-path-references-to-ActiveQt.patch +++ b/patches/0065-Changed-path-references-to-ActiveQt.patch @@ -4,14 +4,14 @@ Date: Thu, 27 Jan 2011 09:47:08 +0100 Subject: [PATCH] Changed path references to ActiveQt. --- - qtkernel/mkspecs/features/win32/qaxcontainer.prf | 4 ++++ - qtkernel/mkspecs/features/win32/qaxserver.prf | 3 +++ + qtbase/mkspecs/features/win32/qaxcontainer.prf | 4 ++++ + qtbase/mkspecs/features/win32/qaxserver.prf | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-) -diff --git a/qtkernel/mkspecs/features/win32/qaxcontainer.prf b/qtkernel/mkspecs/features/win32/qaxcontainer.prf +diff --git a/qtbase/mkspecs/features/win32/qaxcontainer.prf b/qtbase/mkspecs/features/win32/qaxcontainer.prf index 34c6dfe..2d0ff85 100644 ---- a/qtkernel/mkspecs/features/win32/qaxcontainer.prf -+++ b/qtkernel/mkspecs/features/win32/qaxcontainer.prf +--- a/qtbase/mkspecs/features/win32/qaxcontainer.prf ++++ b/qtbase/mkspecs/features/win32/qaxcontainer.prf @@ -8,6 +8,10 @@ LIBS += -lQAxContainer } @@ -23,10 +23,10 @@ index 34c6dfe..2d0ff85 100644 qtPrepareTool(QMAKE_DUMPCPP, dumpcpp) dumpcpp_decl.commands = $$QMAKE_DUMPCPP ${QMAKE_FILE_IN} -o ${QMAKE_FILE_BASE} -diff --git a/qtkernel/mkspecs/features/win32/qaxserver.prf b/qtkernel/mkspecs/features/win32/qaxserver.prf +diff --git a/qtbase/mkspecs/features/win32/qaxserver.prf b/qtbase/mkspecs/features/win32/qaxserver.prf index 2899976..6022a3f 100644 ---- a/qtkernel/mkspecs/features/win32/qaxserver.prf -+++ b/qtkernel/mkspecs/features/win32/qaxserver.prf +--- a/qtbase/mkspecs/features/win32/qaxserver.prf ++++ b/qtbase/mkspecs/features/win32/qaxserver.prf @@ -7,6 +7,7 @@ ACTIVEQT_VERSION = $$VERSION isEmpty(ACTIVEQT_VERSION):ACTIVEQT_VERSION = 1.0 diff --git a/patches/0072-Made-sure-syncqt-gets-called-correctly-even-if-it-is.patch b/patches/0072-Made-sure-syncqt-gets-called-correctly-even-if-it-is.patch index 366a5d5..30482c6 100644 --- a/patches/0072-Made-sure-syncqt-gets-called-correctly-even-if-it-is.patch +++ b/patches/0072-Made-sure-syncqt-gets-called-correctly-even-if-it-is.patch @@ -4,14 +4,14 @@ Date: Fri, 28 Jan 2011 15:17:00 +0100 Subject: [PATCH] Made sure syncqt gets called correctly even if it is not in the PATH. --- - qtkernel/bin/syncqt.bat | 6 ++++-- - qtkernel/mkspecs/features/default_pre.prf | 3 ++- + qtbase/bin/syncqt.bat | 6 ++++-- + qtbase/mkspecs/features/default_pre.prf | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) -diff --git a/qtkernel/bin/syncqt.bat b/qtkernel/bin/syncqt.bat +diff --git a/qtbase/bin/syncqt.bat b/qtbase/bin/syncqt.bat index dd0da87..5167f3b 100755 ---- a/qtkernel/bin/syncqt.bat -+++ b/qtkernel/bin/syncqt.bat +--- a/qtbase/bin/syncqt.bat ++++ b/qtbase/bin/syncqt.bat @@ -38,5 +38,7 @@ :: $QT_END_LICENSE$ :: @@ -22,10 +22,10 @@ index dd0da87..5167f3b 100755 +rem ***** This assumes PERL is in the PATH ***** +set scriptpath=%~dp0 +perl.exe %scriptpath%syncqt %* -diff --git a/qtkernel/mkspecs/features/default_pre.prf b/qtkernel/mkspecs/features/default_pre.prf +diff --git a/qtbase/mkspecs/features/default_pre.prf b/qtbase/mkspecs/features/default_pre.prf index b8779c8..adcdbb7 100644 ---- a/qtkernel/mkspecs/features/default_pre.prf -+++ b/qtkernel/mkspecs/features/default_pre.prf +--- a/qtbase/mkspecs/features/default_pre.prf ++++ b/qtbase/mkspecs/features/default_pre.prf @@ -25,7 +25,8 @@ exists($$_PRO_FILE_PWD_/sync.profile) { else:QTFWD="-qtdir $$QTDIR" diff --git a/patches/0073-Avoid-recursively-including-the-same-arch.pri-file.patch b/patches/0073-Avoid-recursively-including-the-same-arch.pri-file.patch index b24f84c..4dd8a8a 100644 --- a/patches/0073-Avoid-recursively-including-the-same-arch.pri-file.patch +++ b/patches/0073-Avoid-recursively-including-the-same-arch.pri-file.patch @@ -4,13 +4,13 @@ Date: Tue, 8 Feb 2011 11:36:13 +0100 Subject: [PATCH] Avoid recursively including the same arch.pri file --- - qtkernel/src/corelib/arch/arch.pri | 4 +++- + qtbase/src/corelib/arch/arch.pri | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) -diff --git a/qtkernel/src/corelib/arch/arch.pri b/qtkernel/src/corelib/arch/arch.pri +diff --git a/qtbase/src/corelib/arch/arch.pri b/qtbase/src/corelib/arch/arch.pri index cd23e5e..5ed5a25 100644 ---- a/qtkernel/src/corelib/arch/arch.pri -+++ b/qtkernel/src/corelib/arch/arch.pri +--- a/qtbase/src/corelib/arch/arch.pri ++++ b/qtbase/src/corelib/arch/arch.pri @@ -35,4 +35,6 @@ integrity:HEADERS += arch/qatomic_integrity.h QT_ARCH_CPP = $$QT_SOURCE_TREE/src/corelib/arch/$$QT_ARCH diff --git a/patches/0074-Properly-detect-qmodule.pri.patch b/patches/0074-Properly-detect-qmodule.pri.patch index e909e7e..ed37b8e 100644 --- a/patches/0074-Properly-detect-qmodule.pri.patch +++ b/patches/0074-Properly-detect-qmodule.pri.patch @@ -4,25 +4,25 @@ Date: Tue, 1 Feb 2011 14:38:28 -0600 Subject: [PATCH] Properly detect qmodule.pri --- - qtkernel/mkspecs/features/qt_module.prf | 10 ++++++---- + qtbase/mkspecs/features/qt_module.prf | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) -diff --git a/qtkernel/mkspecs/features/qt_module.prf b/qtkernel/mkspecs/features/qt_module.prf +diff --git a/qtbase/mkspecs/features/qt_module.prf b/qtbase/mkspecs/features/qt_module.prf index db8d235..28a2a97 100644 ---- a/qtkernel/mkspecs/features/qt_module.prf -+++ b/qtkernel/mkspecs/features/qt_module.prf +--- a/qtbase/mkspecs/features/qt_module.prf ++++ b/qtbase/mkspecs/features/qt_module.prf @@ -3,10 +3,12 @@ # Consequently, we have to do some stunts to figure out where to find qmodule.pri. isEmpty(QMAKE_QT_MODULE)|!exists($$QMAKE_QT_MODULE) { - exists($$_QMAKE_CACHE_/mkspecs/qmodule.pri):QMAKE_QT_MODULE = $$_QMAKE_CACHE_/mkspecs/qmodule.pri -- else:exists($$_QMAKE_CACHE_/qtkernel/mkspecs/qmodule.pri):QMAKE_QT_MODULE = $$_QMAKE_CACHE_/qtkernel/mkspecs/qmodule.pri +- else:exists($$_QMAKE_CACHE_/qtbase/mkspecs/qmodule.pri):QMAKE_QT_MODULE = $$_QMAKE_CACHE_/qtbase/mkspecs/qmodule.pri - else:if(!isEmpty(QT_BUILD_TREE) & exists($$QT_BUILD_TREE/mkspecs/qmodule.pri)):QMAKE_QT_MODULE = $$QT_BUILD_TREE/mkspecs/qmodule.pri - else:exists($$[QT_INSTALL_DATA]/mkspecs/qmodule.pri):QMAKE_QT_MODULE = $$[QT_INSTALL_DATA]/mkspecs/qmodule.pri + exists($$QTDIR/mkspecs/qmodule.pri):QMAKE_QT_MODULE = $$QTDIR/mkspecs/qmodule.pri + QMAKE_CACHE_DIR = $$dirname(_QMAKE_CACHE_) + !exists($$QMAKE_QT_MODULE):exists($$QMAKE_CACHE_DIR/mkspecs/qmodule.pri):QMAKE_QT_MODULE = $$QMAKE_CACHE_DIR/mkspecs/qmodule.pri -+ !exists($$QMAKE_QT_MODULE):exists($$QMAKE_CACHE_DIR/qtkernel/mkspecs/qmodule.pri):QMAKE_QT_MODULE = $$QMAKE_CACHE_DIR/qtkernel/mkspecs/qmodule.pri ++ !exists($$QMAKE_QT_MODULE):exists($$QMAKE_CACHE_DIR/qtbase/mkspecs/qmodule.pri):QMAKE_QT_MODULE = $$QMAKE_CACHE_DIR/qtbase/mkspecs/qmodule.pri + !exists($$QMAKE_QT_MODULE):if(!isEmpty(QT_BUILD_TREE) & exists($$QT_BUILD_TREE/mkspecs/qmodule.pri)):QMAKE_QT_MODULE = $$QT_BUILD_TREE/mkspecs/qmodule.pri + !exists($$QMAKE_QT_MODULE):exists($$[QT_INSTALL_DATA]/mkspecs/qmodule.pri):QMAKE_QT_MODULE = $$[QT_INSTALL_DATA]/mkspecs/qmodule.pri } diff --git a/patches/0076-Temporarily-pointing-QT_MODULE_LIB_BASE-to-qtkernel-.patch b/patches/0076-Temporarily-pointing-QT_MODULE_LIB_BASE-to-qtbase-.patch index c901eed..3f9bd8d 100644 --- a/patches/0076-Temporarily-pointing-QT_MODULE_LIB_BASE-to-qtkernel-.patch +++ b/patches/0076-Temporarily-pointing-QT_MODULE_LIB_BASE-to-qtbase-.patch @@ -1,24 +1,24 @@ From 8d627953dfa387082d9dbcad2164c25556fe3bc5 Mon Sep 17 00:00:00 2001 From: Prasanth Ullattil <prasanth.ullattil@nokia.com> Date: Mon, 28 Feb 2011 16:19:40 +0100 -Subject: [PATCH] Temporarily pointing QT_MODULE_LIB_BASE to qtkernel/lib +Subject: [PATCH] Temporarily pointing QT_MODULE_LIB_BASE to qtbase/lib This has to changed when we start to generate the module binaries in their respective lib/bin folders. --- - qtkernel/bin/syncqt | 2 +- + qtbase/bin/syncqt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt +diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt index 0433240..0422b56 100755 ---- a/qtkernel/bin/syncqt -+++ b/qtkernel/bin/syncqt +--- a/qtbase/bin/syncqt ++++ b/qtbase/bin/syncqt @@ -1008,7 +1008,7 @@ foreach my $lib (@modules_to_sync) { print MODULE_PRI_FILE "QT_MODULE_BASE = $basedir\n"; print MODULE_PRI_FILE "QT_MODULE_BIN_BASE = $out_basedir/bin\n"; print MODULE_PRI_FILE "QT_MODULE_INCLUDE_BASE = $out_basedir/include\n"; - print MODULE_PRI_FILE "QT_MODULE_LIB_BASE = $out_basedir/lib\n"; -+ print MODULE_PRI_FILE "QT_MODULE_LIB_BASE = $qtkerneldir/lib\n"; ++ print MODULE_PRI_FILE "QT_MODULE_LIB_BASE = $qtbasedir/lib\n"; print MODULE_PRI_FILE "include($modulepri)\n"; close MODULE_PRI_FILE; utime(time, (stat($modulepri))[9], $moduleprifwd); diff --git a/patches/0078-Make-qmake-respect-subdir-.CONFIG-no_default_install.patch b/patches/0078-Make-qmake-respect-subdir-.CONFIG-no_default_install.patch index b4c32c2..7df41f0 100644 --- a/patches/0078-Make-qmake-respect-subdir-.CONFIG-no_default_install.patch +++ b/patches/0078-Make-qmake-respect-subdir-.CONFIG-no_default_install.patch @@ -5,13 +5,13 @@ Subject: [PATCH] Make qmake respect <subdir>.CONFIG = no_default_install It already respects no_default_target --- - qtkernel/qmake/generators/makefile.cpp | 4 ++++ + qtbase/qmake/generators/makefile.cpp | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) -diff --git a/qtkernel/qmake/generators/makefile.cpp b/qtkernel/qmake/generators/makefile.cpp +diff --git a/qtbase/qmake/generators/makefile.cpp b/qtbase/qmake/generators/makefile.cpp index 595768f..4c41559 100644 ---- a/qtkernel/qmake/generators/makefile.cpp -+++ b/qtkernel/qmake/generators/makefile.cpp +--- a/qtbase/qmake/generators/makefile.cpp ++++ b/qtbase/qmake/generators/makefile.cpp @@ -2567,6 +2567,10 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT && project->values(subTarget->name + ".CONFIG").indexOf("no_default_target") != -1) { continue; diff --git a/patches/0079-Build-examples-and-demos-in-qtkernel.patch b/patches/0079-Build-examples-and-demos-in-qtbase.patch index ad805f0..f172735 100644 --- a/patches/0079-Build-examples-and-demos-in-qtkernel.patch +++ b/patches/0079-Build-examples-and-demos-in-qtbase.patch @@ -1,17 +1,17 @@ From 747f3fb3ddc199e431a0c1870b1b30a667ee53af Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Fri, 25 Feb 2011 19:14:08 +0000 -Subject: [PATCH] Build examples and demos in qtkernel +Subject: [PATCH] Build examples and demos in qtbase --- - qtkernel/configure | 2 +- - qtkernel/qtkernel.pro | 15 +-------------- + qtbase/configure | 2 +- + qtbase/qtbase.pro | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) -diff --git a/qtkernel/configure b/qtkernel/configure +diff --git a/qtbase/configure b/qtbase/configure index 8916516..020393e 100755 ---- a/qtkernel/configure -+++ b/qtkernel/configure +--- a/qtbase/configure ++++ b/qtbase/configure @@ -699,7 +699,7 @@ CFG_FONTCONFIG=auto CFG_QWS_FREETYPE=auto CFG_LIBFREETYPE=auto @@ -21,10 +21,10 @@ index 8916516..020393e 100755 CFG_BUILD_PARTS="" CFG_NOBUILD_PARTS="" CFG_RELEASE_QMAKE=no -diff --git a/qtkernel/qtkernel.pro b/qtkernel/qtkernel.pro +diff --git a/qtbase/qtbase.pro b/qtbase/qtbase.pro index 05c745e..fd7b4b0 100644 ---- a/qtkernel/qtkernel.pro -+++ b/qtkernel/qtkernel.pro +--- a/qtbase/qtbase.pro ++++ b/qtbase/qtbase.pro @@ -7,27 +7,14 @@ TEMPLATE = subdirs cross_compile: CONFIG += nostrip diff --git a/patches/0080-Remove-moved-examples-demos.patch b/patches/0080-Remove-moved-examples-demos.patch index 0650077..8f6120c 100644 --- a/patches/0080-Remove-moved-examples-demos.patch +++ b/patches/0080-Remove-moved-examples-demos.patch @@ -4,22 +4,22 @@ Date: Wed, 2 Mar 2011 13:44:28 -0600 Subject: [PATCH] Remove moved examples/demos --- - qtkernel/demos/demos.pro | 2 -- - qtkernel/demos/embedded/embedded.pro | 20 -------------------- - qtkernel/examples/desktop/desktop.pro | 2 -- - qtkernel/examples/draganddrop/draganddrop.pro | 2 -- - qtkernel/examples/examples.pro | 2 -- - qtkernel/examples/graphicsview/graphicsview.pro | 1 - - qtkernel/examples/network/network.pro | 4 ---- - qtkernel/examples/opengl/opengl.pro | 5 ----- - qtkernel/examples/painting/painting.pro | 2 -- - qtkernel/examples/richtext/richtext.pro | 2 -- + qtbase/demos/demos.pro | 2 -- + qtbase/demos/embedded/embedded.pro | 20 -------------------- + qtbase/examples/desktop/desktop.pro | 2 -- + qtbase/examples/draganddrop/draganddrop.pro | 2 -- + qtbase/examples/examples.pro | 2 -- + qtbase/examples/graphicsview/graphicsview.pro | 1 - + qtbase/examples/network/network.pro | 4 ---- + qtbase/examples/opengl/opengl.pro | 5 ----- + qtbase/examples/painting/painting.pro | 2 -- + qtbase/examples/richtext/richtext.pro | 2 -- 10 files changed, 0 insertions(+), 42 deletions(-) -diff --git a/qtkernel/demos/demos.pro b/qtkernel/demos/demos.pro +diff --git a/qtbase/demos/demos.pro b/qtbase/demos/demos.pro index 8664dad..8b40f20 100644 ---- a/qtkernel/demos/demos.pro -+++ b/qtkernel/demos/demos.pro +--- a/qtbase/demos/demos.pro ++++ b/qtbase/demos/demos.pro @@ -47,8 +47,6 @@ SUBDIRS += demos_boxes mac* && !qpa: SUBDIRS += demos_macmainwindow wince*|symbian|embedded|x11: SUBDIRS += demos_embedded @@ -29,10 +29,10 @@ index 8664dad..8b40f20 100644 !cross_compile:{ contains(QT_BUILD_PARTS, tools):{ !wince*:SUBDIRS += demos_sqlbrowser demos_qtdemo -diff --git a/qtkernel/demos/embedded/embedded.pro b/qtkernel/demos/embedded/embedded.pro +diff --git a/qtbase/demos/embedded/embedded.pro b/qtbase/demos/embedded/embedded.pro index 74b630a..3724951 100644 ---- a/qtkernel/demos/embedded/embedded.pro -+++ b/qtkernel/demos/embedded/embedded.pro +--- a/qtbase/demos/embedded/embedded.pro ++++ b/qtbase/demos/embedded/embedded.pro @@ -1,28 +1,8 @@ TEMPLATE = subdirs SUBDIRS = styledemo raycasting flickable digiflip @@ -62,10 +62,10 @@ index 74b630a..3724951 100644 # install sources.files = README *.pro -diff --git a/qtkernel/examples/desktop/desktop.pro b/qtkernel/examples/desktop/desktop.pro +diff --git a/qtbase/examples/desktop/desktop.pro b/qtbase/examples/desktop/desktop.pro index 65f6b91..5a26cdf 100644 ---- a/qtkernel/examples/desktop/desktop.pro -+++ b/qtkernel/examples/desktop/desktop.pro +--- a/qtbase/examples/desktop/desktop.pro ++++ b/qtbase/examples/desktop/desktop.pro @@ -2,8 +2,6 @@ TEMPLATE = subdirs CONFIG += ordered SUBDIRS = screenshot @@ -73,12 +73,12 @@ index 65f6b91..5a26cdf 100644 -!symbian:contains(QT_CONFIG, svg): SUBDIRS += systray - # install - target.path = $$[QT_INSTALL_EXAMPLES]/qtkernel/desktop + target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/desktop sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS desktop.pro README -diff --git a/qtkernel/examples/draganddrop/draganddrop.pro b/qtkernel/examples/draganddrop/draganddrop.pro +diff --git a/qtbase/examples/draganddrop/draganddrop.pro b/qtbase/examples/draganddrop/draganddrop.pro index 4f7baf5..39431d4 100644 ---- a/qtkernel/examples/draganddrop/draganddrop.pro -+++ b/qtkernel/examples/draganddrop/draganddrop.pro +--- a/qtbase/examples/draganddrop/draganddrop.pro ++++ b/qtbase/examples/draganddrop/draganddrop.pro @@ -5,8 +5,6 @@ SUBDIRS = draggableicons \ fridgemagnets \ puzzle @@ -88,10 +88,10 @@ index 4f7baf5..39431d4 100644 wince*: SUBDIRS -= dropsite symbian: SUBDIRS -= dropsite # install -diff --git a/qtkernel/examples/examples.pro b/qtkernel/examples/examples.pro +diff --git a/qtbase/examples/examples.pro b/qtbase/examples/examples.pro index ec0c1b0..8efda7b 100644 ---- a/qtkernel/examples/examples.pro -+++ b/qtkernel/examples/examples.pro +--- a/qtbase/examples/examples.pro ++++ b/qtbase/examples/examples.pro @@ -30,8 +30,6 @@ SUBDIRS = \ gestures } @@ -101,10 +101,10 @@ index ec0c1b0..8efda7b 100644 symbian: SUBDIRS = \ graphicsview \ itemviews \ -diff --git a/qtkernel/examples/graphicsview/graphicsview.pro b/qtkernel/examples/graphicsview/graphicsview.pro +diff --git a/qtbase/examples/graphicsview/graphicsview.pro b/qtbase/examples/graphicsview/graphicsview.pro index 89c2331..099812f 100644 ---- a/qtkernel/examples/graphicsview/graphicsview.pro -+++ b/qtkernel/examples/graphicsview/graphicsview.pro +--- a/qtbase/examples/graphicsview/graphicsview.pro ++++ b/qtbase/examples/graphicsview/graphicsview.pro @@ -13,7 +13,6 @@ SUBDIRS = \ simpleanchorlayout \ weatheranchorlayout @@ -113,10 +113,10 @@ index 89c2331..099812f 100644 contains(DEFINES, QT_NO_CURSOR)|contains(DEFINES, QT_NO_DRAGANDDROP): SUBDIRS -= dragdroprobot # install -diff --git a/qtkernel/examples/network/network.pro b/qtkernel/examples/network/network.pro +diff --git a/qtbase/examples/network/network.pro b/qtbase/examples/network/network.pro index 8f079f5..60669bf 100644 ---- a/qtkernel/examples/network/network.pro -+++ b/qtkernel/examples/network/network.pro +--- a/qtbase/examples/network/network.pro ++++ b/qtbase/examples/network/network.pro @@ -20,10 +20,6 @@ SUBDIRS = \ multicastreceiver \ multicastsender @@ -128,10 +128,10 @@ index 8f079f5..60669bf 100644 # no QProcess !vxworks:!qnx:SUBDIRS += network-chat -diff --git a/qtkernel/examples/opengl/opengl.pro b/qtkernel/examples/opengl/opengl.pro +diff --git a/qtbase/examples/opengl/opengl.pro b/qtbase/examples/opengl/opengl.pro index 3093bbc..0569598 100644 ---- a/qtkernel/examples/opengl/opengl.pro -+++ b/qtkernel/examples/opengl/opengl.pro +--- a/qtbase/examples/opengl/opengl.pro ++++ b/qtbase/examples/opengl/opengl.pro @@ -19,11 +19,6 @@ contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2){ framebufferobject2 \ samplebuffers \ @@ -144,10 +144,10 @@ index 3093bbc..0569598 100644 } # install -diff --git a/qtkernel/examples/painting/painting.pro b/qtkernel/examples/painting/painting.pro +diff --git a/qtbase/examples/painting/painting.pro b/qtbase/examples/painting/painting.pro index 748fe8d..c5d7499 100644 ---- a/qtkernel/examples/painting/painting.pro -+++ b/qtkernel/examples/painting/painting.pro +--- a/qtbase/examples/painting/painting.pro ++++ b/qtbase/examples/painting/painting.pro @@ -7,8 +7,6 @@ SUBDIRS = basicdrawing \ !wince*:!symbian: SUBDIRS += fontsampler @@ -155,12 +155,12 @@ index 748fe8d..c5d7499 100644 -contains(QT_CONFIG, svg): SUBDIRS += svggenerator svgviewer - # install - target.path = $$[QT_INSTALL_EXAMPLES]/qtkernel/painting + target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS painting.pro README -diff --git a/qtkernel/examples/richtext/richtext.pro b/qtkernel/examples/richtext/richtext.pro +diff --git a/qtbase/examples/richtext/richtext.pro b/qtbase/examples/richtext/richtext.pro index d00fabe..6c23edd 100644 ---- a/qtkernel/examples/richtext/richtext.pro -+++ b/qtkernel/examples/richtext/richtext.pro +--- a/qtbase/examples/richtext/richtext.pro ++++ b/qtbase/examples/richtext/richtext.pro @@ -3,8 +3,6 @@ SUBDIRS = calendar \ orderform \ syntaxhighlighter @@ -168,7 +168,7 @@ index d00fabe..6c23edd 100644 -contains(QT_CONFIG, svg): SUBDIRS += textobject - # install - target.path = $$[QT_INSTALL_EXAMPLES]/qtkernel/richtext + target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS richtext.pro README -- 1.7.1 diff --git a/patches/0084-Load-the-sync.profile-after-setting-the-variables.patch b/patches/0084-Load-the-sync.profile-after-setting-the-variables.patch index 307ccb4..ab02603 100644 --- a/patches/0084-Load-the-sync.profile-after-setting-the-variables.patch +++ b/patches/0084-Load-the-sync.profile-after-setting-the-variables.patch @@ -4,14 +4,14 @@ Date: Thu, 10 Mar 2011 16:23:01 +0100 Subject: [PATCH] Load the sync.profile after setting the variables. --- - qtkernel/bin/syncqt | 19 ++++++++++--------- + qtbase/bin/syncqt | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) -diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt +diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt index 0422b56..1228c3a 100755 ---- a/qtkernel/bin/syncqt -+++ b/qtkernel/bin/syncqt -@@ -716,6 +716,16 @@ die "Cannot automatically detect/use provided path to QtKernel's build directory +--- a/qtbase/bin/syncqt ++++ b/qtbase/bin/syncqt +@@ -716,6 +716,16 @@ die "Cannot automatically detect/use provided path to QtBase's build directory # if we have no $basedir we cannot be sure which sources you want, so die die "Could not find any sync.profile for your module!\nPass <module directory> to syncqt to sync your header files.\nsyncqt failed" if (!$basedir); diff --git a/patches/0085-Removed-uic3-autotest-from-qtkernel.patch b/patches/0085-Removed-uic3-autotest-from-qtbase.patch index 422f0cc..9c09d0c 100644 --- a/patches/0085-Removed-uic3-autotest-from-qtkernel.patch +++ b/patches/0085-Removed-uic3-autotest-from-qtbase.patch @@ -1,16 +1,16 @@ From dd57c88afabc4c4e69005a277ffb7615484c7aeb Mon Sep 17 00:00:00 2001 From: Prasanth Ullattil <prasanth.ullattil@nokia.com> Date: Thu, 17 Mar 2011 10:08:57 +0100 -Subject: [PATCH] Removed uic3 autotest from qtkernel +Subject: [PATCH] Removed uic3 autotest from qtbase --- - qtkernel/tests/auto/host.pro | 2 +- + qtbase/tests/auto/host.pro | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -diff --git a/qtkernel/tests/auto/host.pro b/qtkernel/tests/auto/host.pro +diff --git a/qtbase/tests/auto/host.pro b/qtbase/tests/auto/host.pro index 3ae6a7a..a128daa 100644 ---- a/qtkernel/tests/auto/host.pro -+++ b/qtkernel/tests/auto/host.pro +--- a/qtbase/tests/auto/host.pro ++++ b/qtbase/tests/auto/host.pro @@ -10,5 +10,5 @@ SUBDIRS=\ #atwrapper \ # These tests need significant updating, #uiloader \ # they have hardcoded machine names etc. diff --git a/patches/0086-Added-QT.-module-.imports-support-to-module-profiles.patch b/patches/0086-Added-QT.-module-.imports-support-to-module-profiles.patch index 7683f2d..c41872c 100644 --- a/patches/0086-Added-QT.-module-.imports-support-to-module-profiles.patch +++ b/patches/0086-Added-QT.-module-.imports-support-to-module-profiles.patch @@ -7,18 +7,18 @@ Subject: [PATCH] Added QT.<module>.imports support to module profiles. activeqt/modules/qt_activeqt.pri | 1 + phonon/modules/qt_phonon.pri | 1 + qt3support/modules/qt_qt3support.pri | 1 + - qtkernel/bin/syncqt | 1 + - qtkernel/mkspecs/features/qt_config.prf | 1 + - qtkernel/src/modules/qt_core.pri | 1 + - qtkernel/src/modules/qt_dbus.pri | 1 + - qtkernel/src/modules/qt_network.pri | 1 + - qtkernel/src/modules/qt_opengl.pri | 1 + - qtkernel/src/modules/qt_openvg.pri | 1 + - qtkernel/src/modules/qt_sql.pri | 1 + - qtkernel/src/modules/qt_testlib.pri | 1 + - qtkernel/src/modules/qt_uilib.pri | 1 + - qtkernel/src/modules/qt_uitools.pri | 1 + - qtkernel/src/modules/qt_xml.pri | 1 + + qtbase/bin/syncqt | 1 + + qtbase/mkspecs/features/qt_config.prf | 1 + + qtbase/src/modules/qt_core.pri | 1 + + qtbase/src/modules/qt_dbus.pri | 1 + + qtbase/src/modules/qt_network.pri | 1 + + qtbase/src/modules/qt_opengl.pri | 1 + + qtbase/src/modules/qt_openvg.pri | 1 + + qtbase/src/modules/qt_sql.pri | 1 + + qtbase/src/modules/qt_testlib.pri | 1 + + qtbase/src/modules/qt_uilib.pri | 1 + + qtbase/src/modules/qt_uitools.pri | 1 + + qtbase/src/modules/qt_xml.pri | 1 + qtmultimedia/modules/qt_multimedia.pri | 1 + qtdeclarative/modules/qt_declarative.pri | 1 + qtscript/modules/qt_script.pri | 1 + @@ -66,22 +66,22 @@ index f78c269..082ad1a 100644 QT.qt3support.depends = core gui QT.qt3support.DEFINES = QT3_SUPPORT QT_QT3SUPPORT_LIB -diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt +diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt index 1228c3a..7446f3e 100755 ---- a/qtkernel/bin/syncqt -+++ b/qtkernel/bin/syncqt +--- a/qtbase/bin/syncqt ++++ b/qtbase/bin/syncqt @@ -1009,6 +1009,7 @@ foreach my $lib (@modules_to_sync) { print MODULE_PRI_FILE "QT_MODULE_BASE = $basedir\n"; print MODULE_PRI_FILE "QT_MODULE_BIN_BASE = $out_basedir/bin\n"; print MODULE_PRI_FILE "QT_MODULE_INCLUDE_BASE = $out_basedir/include\n"; -+ print MODULE_PRI_FILE "QT_MODULE_IMPORT_BASE = $qtkerneldir/imports\n"; - print MODULE_PRI_FILE "QT_MODULE_LIB_BASE = $qtkerneldir/lib\n"; ++ print MODULE_PRI_FILE "QT_MODULE_IMPORT_BASE = $qtbasedir/imports\n"; + print MODULE_PRI_FILE "QT_MODULE_LIB_BASE = $qtbasedir/lib\n"; print MODULE_PRI_FILE "include($modulepri)\n"; close MODULE_PRI_FILE; -diff --git a/qtkernel/mkspecs/features/qt_config.prf b/qtkernel/mkspecs/features/qt_config.prf +diff --git a/qtbase/mkspecs/features/qt_config.prf b/qtbase/mkspecs/features/qt_config.prf index 7e80ad3..0be4dee 100644 ---- a/qtkernel/mkspecs/features/qt_config.prf -+++ b/qtkernel/mkspecs/features/qt_config.prf +--- a/qtbase/mkspecs/features/qt_config.prf ++++ b/qtbase/mkspecs/features/qt_config.prf @@ -21,6 +21,7 @@ isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) { QT_MODULE_INCLUDE_BASE = $$[QT_INSTALL_HEADERS] QT_MODULE_LIB_BASE = $$[QT_INSTALL_LIBS] @@ -90,10 +90,10 @@ index 7e80ad3..0be4dee 100644 include($$mod) } } -diff --git a/qtkernel/src/modules/qt_core.pri b/qtkernel/src/modules/qt_core.pri +diff --git a/qtbase/src/modules/qt_core.pri b/qtbase/src/modules/qt_core.pri index 99f3fa6..dc2ca54 100644 ---- a/qtkernel/src/modules/qt_core.pri -+++ b/qtkernel/src/modules/qt_core.pri +--- a/qtbase/src/modules/qt_core.pri ++++ b/qtbase/src/modules/qt_core.pri @@ -9,5 +9,6 @@ QT.core.includes = $$QT_MODULE_INCLUDE_BASE/QtCore QT.core.private_includes = $$QT_MODULE_INCLUDE_BASE/QtCore/private QT.core.sources = $$QT_MODULE_BASE/src/corelib @@ -101,10 +101,10 @@ index 99f3fa6..dc2ca54 100644 +QT.core.imports = $$QT_MODULE_IMPORT_BASE QT.core.depends = QT.core.DEFINES = QT_CORE_LIB -diff --git a/qtkernel/src/modules/qt_dbus.pri b/qtkernel/src/modules/qt_dbus.pri +diff --git a/qtbase/src/modules/qt_dbus.pri b/qtbase/src/modules/qt_dbus.pri index 74949b1..7d3b7f3 100644 ---- a/qtkernel/src/modules/qt_dbus.pri -+++ b/qtkernel/src/modules/qt_dbus.pri +--- a/qtbase/src/modules/qt_dbus.pri ++++ b/qtbase/src/modules/qt_dbus.pri @@ -9,6 +9,7 @@ QT.dbus.includes = $$QT_MODULE_INCLUDE_BASE/QtDBus QT.dbus.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDBus/private QT.dbus.sources = $$QT_MODULE_BASE/src/dbus @@ -113,10 +113,10 @@ index 74949b1..7d3b7f3 100644 QT.dbus.depends = core xml QT.dbus.CONFIG = dbusadaptors dbusinterfaces QT.dbus.DEFINES = QT_DBUS_LIB -diff --git a/qtkernel/src/modules/qt_network.pri b/qtkernel/src/modules/qt_network.pri +diff --git a/qtbase/src/modules/qt_network.pri b/qtbase/src/modules/qt_network.pri index 37c941b..f9474bb 100644 ---- a/qtkernel/src/modules/qt_network.pri -+++ b/qtkernel/src/modules/qt_network.pri +--- a/qtbase/src/modules/qt_network.pri ++++ b/qtbase/src/modules/qt_network.pri @@ -9,5 +9,6 @@ QT.network.includes = $$QT_MODULE_INCLUDE_BASE/QtNetwork QT.network.private_includes = $$QT_MODULE_INCLUDE_BASE/QtNetwork/private QT.network.sources = $$QT_MODULE_BASE/src/network @@ -124,10 +124,10 @@ index 37c941b..f9474bb 100644 +QT.network.imports = $$QT_MODULE_IMPORT_BASE QT.network.depends = core QT.network.DEFINES = QT_NETWORK_LIB -diff --git a/qtkernel/src/modules/qt_opengl.pri b/qtkernel/src/modules/qt_opengl.pri +diff --git a/qtbase/src/modules/qt_opengl.pri b/qtbase/src/modules/qt_opengl.pri index 0bd0df7..a54c384 100644 ---- a/qtkernel/src/modules/qt_opengl.pri -+++ b/qtkernel/src/modules/qt_opengl.pri +--- a/qtbase/src/modules/qt_opengl.pri ++++ b/qtbase/src/modules/qt_opengl.pri @@ -9,6 +9,7 @@ QT.opengl.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenGL QT.opengl.private_includes = $$QT_MODULE_INCLUDE_BASE/QtOpenGL/private QT.opengl.sources = $$QT_MODULE_BASE/src/opengl @@ -136,10 +136,10 @@ index 0bd0df7..a54c384 100644 QT.opengl.depends = core gui QT.opengl.CONFIG = opengl QT.opengl.DEFINES = QT_OPENGL_LIB -diff --git a/qtkernel/src/modules/qt_openvg.pri b/qtkernel/src/modules/qt_openvg.pri +diff --git a/qtbase/src/modules/qt_openvg.pri b/qtbase/src/modules/qt_openvg.pri index 9a3ef8b..19a9a81 100644 ---- a/qtkernel/src/modules/qt_openvg.pri -+++ b/qtkernel/src/modules/qt_openvg.pri +--- a/qtbase/src/modules/qt_openvg.pri ++++ b/qtbase/src/modules/qt_openvg.pri @@ -9,6 +9,7 @@ QT.openvg.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenVG QT.openvg.private_includes = $$QT_MODULE_INCLUDE_BASE/QtOpenVG/private QT.openvg.sources = $$QT_MODULE_BASE/src/openvg @@ -148,10 +148,10 @@ index 9a3ef8b..19a9a81 100644 QT.openvg.depends = core gui QT.openvg.CONFIG = openvg QT.openvg.DEFINES = QT_OPENVG_LIB -diff --git a/qtkernel/src/modules/qt_sql.pri b/qtkernel/src/modules/qt_sql.pri +diff --git a/qtbase/src/modules/qt_sql.pri b/qtbase/src/modules/qt_sql.pri index d9b856e..c3950b1 100644 ---- a/qtkernel/src/modules/qt_sql.pri -+++ b/qtkernel/src/modules/qt_sql.pri +--- a/qtbase/src/modules/qt_sql.pri ++++ b/qtbase/src/modules/qt_sql.pri @@ -9,5 +9,6 @@ QT.sql.includes = $$QT_MODULE_INCLUDE_BASE/QtSql QT.sql.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSql/private QT.sql.sources = $$QT_MODULE_BASE/src/sql @@ -159,10 +159,10 @@ index d9b856e..c3950b1 100644 +QT.sql.imports = $$QT_MODULE_IMPORT_BASE QT.sql.depends = core QT.sql.DEFINES = QT_SQL_LIB -diff --git a/qtkernel/src/modules/qt_testlib.pri b/qtkernel/src/modules/qt_testlib.pri +diff --git a/qtbase/src/modules/qt_testlib.pri b/qtbase/src/modules/qt_testlib.pri index 7e9ca09..a4f5dd2 100644 ---- a/qtkernel/src/modules/qt_testlib.pri -+++ b/qtkernel/src/modules/qt_testlib.pri +--- a/qtbase/src/modules/qt_testlib.pri ++++ b/qtbase/src/modules/qt_testlib.pri @@ -9,6 +9,7 @@ QT.testlib.includes = $$QT_MODULE_INCLUDE_BASE/QtTest QT.testlib.private_includes = $$QT_MODULE_INCLUDE_BASE/QtTest/private QT.testlib.sources = $$QT_MODULE_BASE/src/testlib @@ -171,20 +171,20 @@ index 7e9ca09..a4f5dd2 100644 QT.testlib.depends = core QT.testlib.CONFIG = console QT.testlib.DEFINES = QT_TESTLIB_LIB -diff --git a/qtkernel/src/modules/qt_uilib.pri b/qtkernel/src/modules/qt_uilib.pri +diff --git a/qtbase/src/modules/qt_uilib.pri b/qtbase/src/modules/qt_uilib.pri index 0e143de..d1bd19a 100644 ---- a/qtkernel/src/modules/qt_uilib.pri -+++ b/qtkernel/src/modules/qt_uilib.pri +--- a/qtbase/src/modules/qt_uilib.pri ++++ b/qtbase/src/modules/qt_uilib.pri @@ -9,4 +9,5 @@ QT.uilib.includes = $$QT_MODULE_INCLUDE_BASE/QtDesigner QT.uilib.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDesigner/private QT.uilib.sources = $$QT_MODULE_BASE/tools/uilib QT.uilib.libs = $$QT_MODULE_LIB_BASE +QT.uilib.imports = $$QT_MODULE_IMPORT_BASE QT.uilib.depends = xml -diff --git a/qtkernel/src/modules/qt_uitools.pri b/qtkernel/src/modules/qt_uitools.pri +diff --git a/qtbase/src/modules/qt_uitools.pri b/qtbase/src/modules/qt_uitools.pri index 1f4070c..5b71e27 100644 ---- a/qtkernel/src/modules/qt_uitools.pri -+++ b/qtkernel/src/modules/qt_uitools.pri +--- a/qtbase/src/modules/qt_uitools.pri ++++ b/qtbase/src/modules/qt_uitools.pri @@ -9,6 +9,7 @@ QT.uitools.includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools QT.uitools.private_includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools/private QT.uitools.sources = $$QT_MODULE_BASE/src/uitools @@ -193,10 +193,10 @@ index 1f4070c..5b71e27 100644 QT.uitools.depends = xml QT.uitools.DEFINES = QT_UITOOLS_LIB -diff --git a/qtkernel/src/modules/qt_xml.pri b/qtkernel/src/modules/qt_xml.pri +diff --git a/qtbase/src/modules/qt_xml.pri b/qtbase/src/modules/qt_xml.pri index c967cd7..95d9467 100644 ---- a/qtkernel/src/modules/qt_xml.pri -+++ b/qtkernel/src/modules/qt_xml.pri +--- a/qtbase/src/modules/qt_xml.pri ++++ b/qtbase/src/modules/qt_xml.pri @@ -9,5 +9,6 @@ QT.xml.includes = $$QT_MODULE_INCLUDE_BASE/QtXml QT.xml.private_includes = $$QT_MODULE_INCLUDE_BASE/QtXml/private QT.xml.sources = $$QT_MODULE_BASE/src/xml diff --git a/patches/0088-Fixed-make-check-target-for-qtkernel.patch b/patches/0088-Fixed-make-check-target-for-qtbase.patch index e0db978..a51b5ec 100644 --- a/patches/0088-Fixed-make-check-target-for-qtkernel.patch +++ b/patches/0088-Fixed-make-check-target-for-qtbase.patch @@ -1,26 +1,26 @@ From 5e9ac495264dba3e5cfa2a9eb6952dc111ac4a47 Mon Sep 17 00:00:00 2001 From: axis <qt-info@nokia.com> Date: Thu, 17 Mar 2011 11:50:26 +0100 -Subject: [PATCH] Fixed "make check" target for qtkernel. +Subject: [PATCH] Fixed "make check" target for qtbase. It was caused by a missing "tests" target. --- - qtkernel/qtkernel.pro | 6 ++++++ + qtbase/qtbase.pro | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) -diff --git a/qtkernel/qtkernel.pro b/qtkernel/qtkernel.pro +diff --git a/qtbase/qtbase.pro b/qtbase/qtbase.pro index fd7b4b0..5375ef1 100644 ---- a/qtkernel/qtkernel.pro -+++ b/qtkernel/qtkernel.pro +--- a/qtbase/qtbase.pro ++++ b/qtbase/qtbase.pro @@ -22,6 +22,12 @@ for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) { } } -+module_qtkernel_tests.subdir = tests -+module_qtkernel_tests.target = module-qtkernel-tests -+module_qtkernel_tests.depends = module_qtkernel_src -+module_qtkernel_tests.CONFIG = no_default_target no_default_install -+SUBDIRS += module_qtkernel_tests ++module_qtbase_tests.subdir = tests ++module_qtbase_tests.target = module-qtbase-tests ++module_qtbase_tests.depends = module_qtbase_src ++module_qtbase_tests.CONFIG = no_default_target no_default_install ++SUBDIRS += module_qtbase_tests + !symbian: confclean.depends += clean confclean.commands = diff --git a/patches/0089-q3tl.h-is-copied-to-qalgorithms-autotest-directory.patch b/patches/0089-q3tl.h-is-copied-to-qalgorithms-autotest-directory.patch index 961b987..377bd2d 100644 --- a/patches/0089-q3tl.h-is-copied-to-qalgorithms-autotest-directory.patch +++ b/patches/0089-q3tl.h-is-copied-to-qalgorithms-autotest-directory.patch @@ -7,10 +7,10 @@ Subject: [PATCH] q3tl.h is copied to qalgorithms autotest directory .../tests/auto/qalgorithms/tst_qalgorithms.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -diff --git a/qtkernel/tests/auto/qalgorithms/tst_qalgorithms.cpp b/qtkernel/tests/auto/qalgorithms/tst_qalgorithms.cpp +diff --git a/qtbase/tests/auto/qalgorithms/tst_qalgorithms.cpp b/qtbase/tests/auto/qalgorithms/tst_qalgorithms.cpp index 8dd7cbc..d0d8e9a 100644 ---- a/qtkernel/tests/auto/qalgorithms/tst_qalgorithms.cpp -+++ b/qtkernel/tests/auto/qalgorithms/tst_qalgorithms.cpp +--- a/qtbase/tests/auto/qalgorithms/tst_qalgorithms.cpp ++++ b/qtbase/tests/auto/qalgorithms/tst_qalgorithms.cpp @@ -47,7 +47,7 @@ #include <sstream> #include <algorithm> diff --git a/patches/0090-Fixed-syncqt-generation-of-bin-path.patch b/patches/0090-Fixed-syncqt-generation-of-bin-path.patch index 6c2faa7..4647a0c 100644 --- a/patches/0090-Fixed-syncqt-generation-of-bin-path.patch +++ b/patches/0090-Fixed-syncqt-generation-of-bin-path.patch @@ -3,26 +3,26 @@ From: axis <qt-info@nokia.com> Date: Fri, 18 Mar 2011 12:14:01 +0100 Subject: [PATCH] Fixed syncqt generation of bin path. -Now it points to QtKernel's bin directory, in the case of developer +Now it points to QtBase's bin directory, in the case of developer builds. This makes it easier to develop modules together without having to install them first. --- - qtkernel/bin/syncqt | 2 +- + qtbase/bin/syncqt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt +diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt index 7446f3e..cf61270 100755 ---- a/qtkernel/bin/syncqt -+++ b/qtkernel/bin/syncqt +--- a/qtbase/bin/syncqt ++++ b/qtbase/bin/syncqt @@ -1007,7 +1007,7 @@ foreach my $lib (@modules_to_sync) { - my $moduleprifwd = "$qtkerneldir/mkspecs/modules/$modulepriname"; + my $moduleprifwd = "$qtbasedir/mkspecs/modules/$modulepriname"; open MODULE_PRI_FILE, ">$moduleprifwd"; print MODULE_PRI_FILE "QT_MODULE_BASE = $basedir\n"; - print MODULE_PRI_FILE "QT_MODULE_BIN_BASE = $out_basedir/bin\n"; -+ print MODULE_PRI_FILE "QT_MODULE_BIN_BASE = $qtkerneldir/bin\n"; ++ print MODULE_PRI_FILE "QT_MODULE_BIN_BASE = $qtbasedir/bin\n"; print MODULE_PRI_FILE "QT_MODULE_INCLUDE_BASE = $out_basedir/include\n"; - print MODULE_PRI_FILE "QT_MODULE_IMPORT_BASE = $qtkerneldir/imports\n"; - print MODULE_PRI_FILE "QT_MODULE_LIB_BASE = $qtkerneldir/lib\n"; + print MODULE_PRI_FILE "QT_MODULE_IMPORT_BASE = $qtbasedir/imports\n"; + print MODULE_PRI_FILE "QT_MODULE_LIB_BASE = $qtbasedir/lib\n"; -- 1.7.3.2.343.g7d43d diff --git a/patches/0092-Adapted-guiapplauncher-test-to-modularized-Qt.patch b/patches/0092-Adapted-guiapplauncher-test-to-modularized-Qt.patch index 4f55630..e49956b 100644 --- a/patches/0092-Adapted-guiapplauncher-test-to-modularized-Qt.patch +++ b/patches/0092-Adapted-guiapplauncher-test-to-modularized-Qt.patch @@ -6,9 +6,9 @@ Subject: [PATCH] Adapted guiapplauncher test to modularized Qt. Now it reads the test cases from text files in each repository instead. --- - qtkernel/tests/auto/guiapplauncher/README.txt | 2 + - qtkernel/tests/auto/guiapplauncher/demos.txt | 14 ++ - qtkernel/tests/auto/guiapplauncher/examples.txt | 99 +++++++++++ + qtbase/tests/auto/guiapplauncher/README.txt | 2 + + qtbase/tests/auto/guiapplauncher/demos.txt | 14 ++ + qtbase/tests/auto/guiapplauncher/examples.txt | 99 +++++++++++ .../auto/guiapplauncher/tst_guiapplauncher.cpp | 185 +++++--------------- qtscript/tests/auto/guiapplauncher/README.txt | 2 + qtscript/tests/auto/guiapplauncher/examples.txt | 2 + @@ -18,9 +18,9 @@ instead. .../tests/auto/guiapplauncher/demos.txt | 1 + .../tests/auto/guiapplauncher/examples.txt | 1 + 11 files changed, 174 insertions(+), 138 deletions(-) - create mode 100644 qtkernel/tests/auto/guiapplauncher/README.txt - create mode 100644 qtkernel/tests/auto/guiapplauncher/demos.txt - create mode 100644 qtkernel/tests/auto/guiapplauncher/examples.txt + create mode 100644 qtbase/tests/auto/guiapplauncher/README.txt + create mode 100644 qtbase/tests/auto/guiapplauncher/demos.txt + create mode 100644 qtbase/tests/auto/guiapplauncher/examples.txt create mode 100644 qtscript/tests/auto/guiapplauncher/README.txt create mode 100644 qtscript/tests/auto/guiapplauncher/examples.txt create mode 100644 qtsvg/tests/auto/guiapplauncher/README.txt @@ -29,19 +29,19 @@ instead. create mode 100644 qtwebkit-examples-and-demos/tests/auto/guiapplauncher/demos.txt create mode 100644 qtwebkit-examples-and-demos/tests/auto/guiapplauncher/examples.txt -diff --git a/qtkernel/tests/auto/guiapplauncher/README.txt b/qtkernel/tests/auto/guiapplauncher/README.txt +diff --git a/qtbase/tests/auto/guiapplauncher/README.txt b/qtbase/tests/auto/guiapplauncher/README.txt new file mode 100644 index 0000000..d6ea4ef --- /dev/null -+++ b/qtkernel/tests/auto/guiapplauncher/README.txt ++++ b/qtbase/tests/auto/guiapplauncher/README.txt @@ -0,0 +1,2 @@ +The guiapplauncher from the qtqa repository uses the data in this +directory to do its testing for this module. -diff --git a/qtkernel/tests/auto/guiapplauncher/demos.txt b/qtkernel/tests/auto/guiapplauncher/demos.txt +diff --git a/qtbase/tests/auto/guiapplauncher/demos.txt b/qtbase/tests/auto/guiapplauncher/demos.txt new file mode 100644 index 0000000..2835f09 --- /dev/null -+++ b/qtkernel/tests/auto/guiapplauncher/demos.txt ++++ b/qtbase/tests/auto/guiapplauncher/demos.txt @@ -0,0 +1,14 @@ +"Affine Demo", "demos/affine", "affine", 0, -1 +"Books Demo", "demos/books", "books", 0, -1 @@ -57,11 +57,11 @@ index 0000000..2835f09 +"Sub-Attac Demo", "demos/sub-attaq", "sub-attaq", 0, -1 +"TextEdit Demo", "demos/textedit", "textedit", 0, -1 +"Undo Demo", "demos/undo", "undo", 0, -1 -diff --git a/qtkernel/tests/auto/guiapplauncher/examples.txt b/qtkernel/tests/auto/guiapplauncher/examples.txt +diff --git a/qtbase/tests/auto/guiapplauncher/examples.txt b/qtbase/tests/auto/guiapplauncher/examples.txt new file mode 100644 index 0000000..fea7e54 --- /dev/null -+++ b/qtkernel/tests/auto/guiapplauncher/examples.txt ++++ b/qtbase/tests/auto/guiapplauncher/examples.txt @@ -0,0 +1,99 @@ +"animation/animatedtiles Example", "examples/animation/animatedtiles", "animatedtiles", 0, -1 +"animation/appchooser Example", "examples/animation/appchooser", "appchooser", 10, -1 diff --git a/patches/0093-Removed-reference-to-linguist-test-which-is-now-in-q.patch b/patches/0093-Removed-reference-to-linguist-test-which-is-now-in-q.patch index 289ca23..34f7883 100644 --- a/patches/0093-Removed-reference-to-linguist-test-which-is-now-in-q.patch +++ b/patches/0093-Removed-reference-to-linguist-test-which-is-now-in-q.patch @@ -4,13 +4,13 @@ Date: Fri, 18 Mar 2011 16:11:18 +0100 Subject: [PATCH] Removed reference to linguist test, which is now in qttools. --- - qtkernel/tests/auto/host.pro | 1 - + qtbase/tests/auto/host.pro | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) -diff --git a/qtkernel/tests/auto/host.pro b/qtkernel/tests/auto/host.pro +diff --git a/qtbase/tests/auto/host.pro b/qtbase/tests/auto/host.pro index a128daa..61c7c6a 100644 ---- a/qtkernel/tests/auto/host.pro -+++ b/qtkernel/tests/auto/host.pro +--- a/qtbase/tests/auto/host.pro ++++ b/qtbase/tests/auto/host.pro @@ -1,7 +1,6 @@ TEMPLATE=subdirs SUBDIRS=\ diff --git a/patches/0096-Removed-examples-and-demos-that-are-no-longer-in-qtk.patch b/patches/0096-Removed-examples-and-demos-that-are-no-longer-in-qtk.patch index fc5c969..8969912 100644 --- a/patches/0096-Removed-examples-and-demos-that-are-no-longer-in-qtk.patch +++ b/patches/0096-Removed-examples-and-demos-that-are-no-longer-in-qtk.patch @@ -1,17 +1,17 @@ From e660171109226887aaf4e81f18aec44010d81e3d Mon Sep 17 00:00:00 2001 From: axis <qt-info@nokia.com> Date: Mon, 21 Mar 2011 16:38:55 +0100 -Subject: [PATCH] Removed examples and demos that are no longer in qtkernel. +Subject: [PATCH] Removed examples and demos that are no longer in qtbase. --- - qtkernel/demos/demos.pro | 3 +-- - qtkernel/examples/examples.pro | 7 +------ + qtbase/demos/demos.pro | 3 +-- + qtbase/examples/examples.pro | 7 +------ 2 files changed, 2 insertions(+), 8 deletions(-) -diff --git a/qtkernel/demos/demos.pro b/qtkernel/demos/demos.pro +diff --git a/qtbase/demos/demos.pro b/qtbase/demos/demos.pro index 8b40f20..8bdb57d 100644 ---- a/qtkernel/demos/demos.pro -+++ b/qtkernel/demos/demos.pro +--- a/qtbase/demos/demos.pro ++++ b/qtbase/demos/demos.pro @@ -49,8 +49,7 @@ wince*|symbian|embedded|x11: SUBDIRS += demos_embedded !cross_compile:{ @@ -22,10 +22,10 @@ index 8b40f20..8bdb57d 100644 } } -diff --git a/qtkernel/examples/examples.pro b/qtkernel/examples/examples.pro +diff --git a/qtbase/examples/examples.pro b/qtbase/examples/examples.pro index 8efda7b..0680ff4 100644 ---- a/qtkernel/examples/examples.pro -+++ b/qtkernel/examples/examples.pro +--- a/qtbase/examples/examples.pro ++++ b/qtbase/examples/examples.pro @@ -49,12 +49,7 @@ symbian: SUBDIRS = \ } diff --git a/patches/0097-Fixed-maketestselftest-after-guiapplauncher-was-made.patch b/patches/0097-Fixed-maketestselftest-after-guiapplauncher-was-made.patch index fe5c77e..2fe8a2e 100644 --- a/patches/0097-Fixed-maketestselftest-after-guiapplauncher-was-made.patch +++ b/patches/0097-Fixed-maketestselftest-after-guiapplauncher-was-made.patch @@ -7,10 +7,10 @@ Subject: [PATCH] Fixed maketestselftest after guiapplauncher was made a global t .../auto/maketestselftest/tst_maketestselftest.cpp | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) -diff --git a/qtkernel/tests/auto/maketestselftest/tst_maketestselftest.cpp b/qtkernel/tests/auto/maketestselftest/tst_maketestselftest.cpp +diff --git a/qtbase/tests/auto/maketestselftest/tst_maketestselftest.cpp b/qtbase/tests/auto/maketestselftest/tst_maketestselftest.cpp index 8ed8cb8..9fbfd5a 100644 ---- a/qtkernel/tests/auto/maketestselftest/tst_maketestselftest.cpp -+++ b/qtkernel/tests/auto/maketestselftest/tst_maketestselftest.cpp +--- a/qtbase/tests/auto/maketestselftest/tst_maketestselftest.cpp ++++ b/qtbase/tests/auto/maketestselftest/tst_maketestselftest.cpp @@ -148,7 +148,8 @@ void tst_MakeTestSelfTest::tests_pro_files_data() foreach (const QString& subdir, subdirs) { diff --git a/patches/0098-Introduced-the-QT.-module-.plugins-variable-to-modul.patch b/patches/0098-Introduced-the-QT.-module-.plugins-variable-to-modul.patch index f4b1f11..317cfd6 100644 --- a/patches/0098-Introduced-the-QT.-module-.plugins-variable-to-modul.patch +++ b/patches/0098-Introduced-the-QT.-module-.plugins-variable-to-modul.patch @@ -9,74 +9,74 @@ Subject: [PATCH] Introduced the QT.<module>.plugins variable to module profiles. phonon/src/plugins/phonon/mmf/mmf.pro | 2 +- qt3support/modules/qt_qt3support.pri | 1 + qt3support/src/plugins/accessible/accessible.pro | 2 +- - qtkernel/bin/syncqt | 1 + - qtkernel/mkspecs/features/qt_config.prf | 1 + - qtkernel/src/modules/qt_core.pri | 1 + - qtkernel/src/modules/qt_dbus.pri | 1 + - qtkernel/src/modules/qt_gui.pri | 2 ++ - qtkernel/src/modules/qt_network.pri | 1 + - qtkernel/src/modules/qt_opengl.pri | 1 + - qtkernel/src/modules/qt_openvg.pri | 1 + - qtkernel/src/modules/qt_sql.pri | 1 + - qtkernel/src/modules/qt_testlib.pri | 1 + - qtkernel/src/modules/qt_uilib.pri | 1 + - qtkernel/src/modules/qt_uitools.pri | 1 + - qtkernel/src/modules/qt_xml.pri | 1 + + qtbase/bin/syncqt | 1 + + qtbase/mkspecs/features/qt_config.prf | 1 + + qtbase/src/modules/qt_core.pri | 1 + + qtbase/src/modules/qt_dbus.pri | 1 + + qtbase/src/modules/qt_gui.pri | 2 ++ + qtbase/src/modules/qt_network.pri | 1 + + qtbase/src/modules/qt_opengl.pri | 1 + + qtbase/src/modules/qt_openvg.pri | 1 + + qtbase/src/modules/qt_sql.pri | 1 + + qtbase/src/modules/qt_testlib.pri | 1 + + qtbase/src/modules/qt_uilib.pri | 1 + + qtbase/src/modules/qt_uitools.pri | 1 + + qtbase/src/modules/qt_xml.pri | 1 + .../src/plugins/accessible/widgets/widgets.pro | 2 +- - qtkernel/src/plugins/bearer/connman/connman.pro | 2 +- - qtkernel/src/plugins/bearer/corewlan/corewlan.pro | 2 +- - qtkernel/src/plugins/bearer/generic/generic.pro | 2 +- - qtkernel/src/plugins/bearer/icd/icd.pro | 2 +- + qtbase/src/plugins/bearer/connman/connman.pro | 2 +- + qtbase/src/plugins/bearer/corewlan/corewlan.pro | 2 +- + qtbase/src/plugins/bearer/generic/generic.pro | 2 +- + qtbase/src/plugins/bearer/icd/icd.pro | 2 +- .../src/plugins/bearer/nativewifi/nativewifi.pro | 2 +- .../bearer/networkmanager/networkmanager.pro | 2 +- - qtkernel/src/plugins/bearer/nla/nla.pro | 2 +- - qtkernel/src/plugins/bearer/symbian/symbian.pri | 2 +- - qtkernel/src/plugins/codecs/cn/cn.pro | 2 +- - qtkernel/src/plugins/codecs/jp/jp.pro | 2 +- - qtkernel/src/plugins/codecs/kr/kr.pro | 2 +- - qtkernel/src/plugins/codecs/tw/tw.pro | 2 +- + qtbase/src/plugins/bearer/nla/nla.pro | 2 +- + qtbase/src/plugins/bearer/symbian/symbian.pri | 2 +- + qtbase/src/plugins/codecs/cn/cn.pro | 2 +- + qtbase/src/plugins/codecs/jp/jp.pro | 2 +- + qtbase/src/plugins/codecs/kr/kr.pro | 2 +- + qtbase/src/plugins/codecs/tw/tw.pro | 2 +- .../src/plugins/decorations/default/default.pro | 2 +- - qtkernel/src/plugins/decorations/styled/styled.pro | 2 +- + qtbase/src/plugins/decorations/styled/styled.pro | 2 +- .../src/plugins/decorations/windows/windows.pro | 2 +- .../src/plugins/generic/linuxinput/linuxinput.pro | 2 +- - qtkernel/src/plugins/generic/tslib/tslib.pro | 2 +- - qtkernel/src/plugins/gfxdrivers/ahi/ahi.pro | 2 +- + qtbase/src/plugins/generic/tslib/tslib.pro | 2 +- + qtbase/src/plugins/gfxdrivers/ahi/ahi.pro | 2 +- .../src/plugins/gfxdrivers/directfb/directfb.pro | 2 +- .../src/plugins/gfxdrivers/eglnullws/eglnullws.pro | 2 +- .../src/plugins/gfxdrivers/linuxfb/linuxfb.pro | 2 +- .../powervr/pvreglscreen/pvreglscreen.pro | 2 +- - qtkernel/src/plugins/gfxdrivers/qvfb/qvfb.pro | 2 +- + qtbase/src/plugins/gfxdrivers/qvfb/qvfb.pro | 2 +- .../plugins/gfxdrivers/transformed/transformed.pro | 2 +- - qtkernel/src/plugins/gfxdrivers/vnc/vnc.pro | 2 +- + qtbase/src/plugins/gfxdrivers/vnc/vnc.pro | 2 +- .../src/plugins/graphicssystems/meego/meego.pro | 2 +- .../src/plugins/graphicssystems/opengl/opengl.pro | 2 +- .../src/plugins/graphicssystems/openvg/openvg.pro | 2 +- .../plugins/graphicssystems/shivavg/shivavg.pro | 2 +- .../src/plugins/graphicssystems/trace/trace.pro | 2 +- - qtkernel/src/plugins/imageformats/gif/gif.pro | 2 +- - qtkernel/src/plugins/imageformats/ico/ico.pro | 2 +- - qtkernel/src/plugins/imageformats/jpeg/jpeg.pro | 2 +- - qtkernel/src/plugins/imageformats/mng/mng.pro | 2 +- - qtkernel/src/plugins/imageformats/tiff/tiff.pro | 2 +- + qtbase/src/plugins/imageformats/gif/gif.pro | 2 +- + qtbase/src/plugins/imageformats/ico/ico.pro | 2 +- + qtbase/src/plugins/imageformats/jpeg/jpeg.pro | 2 +- + qtbase/src/plugins/imageformats/mng/mng.pro | 2 +- + qtbase/src/plugins/imageformats/tiff/tiff.pro | 2 +- .../plugins/inputmethods/imsw-multi/imsw-multi.pro | 2 +- .../plugins/kbddrivers/linuxinput/linuxinput.pro | 2 +- .../src/plugins/mousedrivers/linuxtp/linuxtp.pro | 2 +- - qtkernel/src/plugins/mousedrivers/pc/pc.pro | 2 +- - qtkernel/src/plugins/mousedrivers/tslib/tslib.pro | 2 +- - qtkernel/src/plugins/platforms/cocoa/cocoa.pro | 2 +- + qtbase/src/plugins/mousedrivers/pc/pc.pro | 2 +- + qtbase/src/plugins/mousedrivers/tslib/tslib.pro | 2 +- + qtbase/src/plugins/platforms/cocoa/cocoa.pro | 2 +- .../src/plugins/platforms/directfb/directfb.pro | 2 +- - qtkernel/src/plugins/platforms/eglfs/eglfs.pro | 2 +- - qtkernel/src/plugins/platforms/fb_base/fb_base.pro | 2 +- - qtkernel/src/plugins/platforms/linuxfb/linuxfb.pro | 2 +- - qtkernel/src/plugins/platforms/minimal/minimal.pro | 2 +- + qtbase/src/plugins/platforms/eglfs/eglfs.pro | 2 +- + qtbase/src/plugins/platforms/fb_base/fb_base.pro | 2 +- + qtbase/src/plugins/platforms/linuxfb/linuxfb.pro | 2 +- + qtbase/src/plugins/platforms/minimal/minimal.pro | 2 +- .../src/plugins/platforms/openkode/openkode.pro | 2 +- .../plugins/platforms/openvglite/openvglite.pro | 2 +- - qtkernel/src/plugins/platforms/qvfb/qvfb.pro | 2 +- - qtkernel/src/plugins/platforms/vnc/vnc.pro | 2 +- - qtkernel/src/plugins/platforms/wayland/wayland.pro | 2 +- - qtkernel/src/plugins/platforms/xlib/xlib.pro | 2 +- - qtkernel/src/plugins/s60/s60pluginbase.pri | 2 +- - qtkernel/src/plugins/sqldrivers/qsqldriverbase.pri | 2 +- + qtbase/src/plugins/platforms/qvfb/qvfb.pro | 2 +- + qtbase/src/plugins/platforms/vnc/vnc.pro | 2 +- + qtbase/src/plugins/platforms/wayland/wayland.pro | 2 +- + qtbase/src/plugins/platforms/xlib/xlib.pro | 2 +- + qtbase/src/plugins/s60/s60pluginbase.pri | 2 +- + qtbase/src/plugins/sqldrivers/qsqldriverbase.pri | 2 +- qtmultimedia/modules/qt_multimedia.pri | 1 + qtdeclarative/modules/qt_declarative.pri | 1 + .../src/plugins/qmltooling/tcpserver/tcpserver.pro | 2 +- @@ -158,22 +158,22 @@ index b69595b..3c458ce 100644 QTDIR_build:REQUIRES += "contains(QT_CONFIG, accessibility)" -diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt +diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt index cf61270..b17d2ea 100755 ---- a/qtkernel/bin/syncqt -+++ b/qtkernel/bin/syncqt +--- a/qtbase/bin/syncqt ++++ b/qtbase/bin/syncqt @@ -1011,6 +1011,7 @@ foreach my $lib (@modules_to_sync) { print MODULE_PRI_FILE "QT_MODULE_INCLUDE_BASE = $out_basedir/include\n"; - print MODULE_PRI_FILE "QT_MODULE_IMPORT_BASE = $qtkerneldir/imports\n"; - print MODULE_PRI_FILE "QT_MODULE_LIB_BASE = $qtkerneldir/lib\n"; -+ print MODULE_PRI_FILE "QT_MODULE_PLUGIN_BASE = $qtkerneldir/plugins\n"; + print MODULE_PRI_FILE "QT_MODULE_IMPORT_BASE = $qtbasedir/imports\n"; + print MODULE_PRI_FILE "QT_MODULE_LIB_BASE = $qtbasedir/lib\n"; ++ print MODULE_PRI_FILE "QT_MODULE_PLUGIN_BASE = $qtbasedir/plugins\n"; print MODULE_PRI_FILE "include($modulepri)\n"; close MODULE_PRI_FILE; utime(time, (stat($modulepri))[9], $moduleprifwd); -diff --git a/qtkernel/mkspecs/features/qt_config.prf b/qtkernel/mkspecs/features/qt_config.prf +diff --git a/qtbase/mkspecs/features/qt_config.prf b/qtbase/mkspecs/features/qt_config.prf index 0be4dee..5afd82c 100644 ---- a/qtkernel/mkspecs/features/qt_config.prf -+++ b/qtkernel/mkspecs/features/qt_config.prf +--- a/qtbase/mkspecs/features/qt_config.prf ++++ b/qtbase/mkspecs/features/qt_config.prf @@ -20,6 +20,7 @@ isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) { # qt_<module>.pri forwarding file QT_MODULE_INCLUDE_BASE = $$[QT_INSTALL_HEADERS] @@ -182,10 +182,10 @@ index 0be4dee..5afd82c 100644 QT_MODULE_BIN_BASE = $$[QT_INSTALL_BINS] QT_MODULE_IMPORT_BASE = $$[QT_INSTALL_IMPORTS] include($$mod) -diff --git a/qtkernel/src/modules/qt_core.pri b/qtkernel/src/modules/qt_core.pri +diff --git a/qtbase/src/modules/qt_core.pri b/qtbase/src/modules/qt_core.pri index dc2ca54..9636fb2 100644 ---- a/qtkernel/src/modules/qt_core.pri -+++ b/qtkernel/src/modules/qt_core.pri +--- a/qtbase/src/modules/qt_core.pri ++++ b/qtbase/src/modules/qt_core.pri @@ -9,6 +9,7 @@ QT.core.includes = $$QT_MODULE_INCLUDE_BASE/QtCore QT.core.private_includes = $$QT_MODULE_INCLUDE_BASE/QtCore/private QT.core.sources = $$QT_MODULE_BASE/src/corelib @@ -194,10 +194,10 @@ index dc2ca54..9636fb2 100644 QT.core.imports = $$QT_MODULE_IMPORT_BASE QT.core.depends = QT.core.DEFINES = QT_CORE_LIB -diff --git a/qtkernel/src/modules/qt_dbus.pri b/qtkernel/src/modules/qt_dbus.pri +diff --git a/qtbase/src/modules/qt_dbus.pri b/qtbase/src/modules/qt_dbus.pri index 7d3b7f3..13c9914 100644 ---- a/qtkernel/src/modules/qt_dbus.pri -+++ b/qtkernel/src/modules/qt_dbus.pri +--- a/qtbase/src/modules/qt_dbus.pri ++++ b/qtbase/src/modules/qt_dbus.pri @@ -9,6 +9,7 @@ QT.dbus.includes = $$QT_MODULE_INCLUDE_BASE/QtDBus QT.dbus.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDBus/private QT.dbus.sources = $$QT_MODULE_BASE/src/dbus @@ -206,10 +206,10 @@ index 7d3b7f3..13c9914 100644 QT.dbus.imports = $$QT_MODULE_IMPORT_BASE QT.dbus.depends = core xml QT.dbus.CONFIG = dbusadaptors dbusinterfaces -diff --git a/qtkernel/src/modules/qt_gui.pri b/qtkernel/src/modules/qt_gui.pri +diff --git a/qtbase/src/modules/qt_gui.pri b/qtbase/src/modules/qt_gui.pri index 74d2931..444f5c4 100644 ---- a/qtkernel/src/modules/qt_gui.pri -+++ b/qtkernel/src/modules/qt_gui.pri +--- a/qtbase/src/modules/qt_gui.pri ++++ b/qtbase/src/modules/qt_gui.pri @@ -8,5 +8,7 @@ QT.gui.includes = $$QT_MODULE_INCLUDE_BASE/QtGui QT.gui.private_includes = $$QT_MODULE_INCLUDE_BASE/QtGui/private QT.gui.sources = $$QT_MODULE_BASE/src/gui @@ -218,10 +218,10 @@ index 74d2931..444f5c4 100644 +QT.gui.imports = $$QT_MODULE_IMPORT_BASE QT.gui.depends = core network QT.gui.DEFINES = QT_GUI_LIB -diff --git a/qtkernel/src/modules/qt_network.pri b/qtkernel/src/modules/qt_network.pri +diff --git a/qtbase/src/modules/qt_network.pri b/qtbase/src/modules/qt_network.pri index f9474bb..f54afd2 100644 ---- a/qtkernel/src/modules/qt_network.pri -+++ b/qtkernel/src/modules/qt_network.pri +--- a/qtbase/src/modules/qt_network.pri ++++ b/qtbase/src/modules/qt_network.pri @@ -9,6 +9,7 @@ QT.network.includes = $$QT_MODULE_INCLUDE_BASE/QtNetwork QT.network.private_includes = $$QT_MODULE_INCLUDE_BASE/QtNetwork/private QT.network.sources = $$QT_MODULE_BASE/src/network @@ -230,10 +230,10 @@ index f9474bb..f54afd2 100644 QT.network.imports = $$QT_MODULE_IMPORT_BASE QT.network.depends = core QT.network.DEFINES = QT_NETWORK_LIB -diff --git a/qtkernel/src/modules/qt_opengl.pri b/qtkernel/src/modules/qt_opengl.pri +diff --git a/qtbase/src/modules/qt_opengl.pri b/qtbase/src/modules/qt_opengl.pri index a54c384..4d9a702 100644 ---- a/qtkernel/src/modules/qt_opengl.pri -+++ b/qtkernel/src/modules/qt_opengl.pri +--- a/qtbase/src/modules/qt_opengl.pri ++++ b/qtbase/src/modules/qt_opengl.pri @@ -9,6 +9,7 @@ QT.opengl.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenGL QT.opengl.private_includes = $$QT_MODULE_INCLUDE_BASE/QtOpenGL/private QT.opengl.sources = $$QT_MODULE_BASE/src/opengl @@ -242,10 +242,10 @@ index a54c384..4d9a702 100644 QT.opengl.imports = $$QT_MODULE_IMPORT_BASE QT.opengl.depends = core gui QT.opengl.CONFIG = opengl -diff --git a/qtkernel/src/modules/qt_openvg.pri b/qtkernel/src/modules/qt_openvg.pri +diff --git a/qtbase/src/modules/qt_openvg.pri b/qtbase/src/modules/qt_openvg.pri index 19a9a81..1261fd9 100644 ---- a/qtkernel/src/modules/qt_openvg.pri -+++ b/qtkernel/src/modules/qt_openvg.pri +--- a/qtbase/src/modules/qt_openvg.pri ++++ b/qtbase/src/modules/qt_openvg.pri @@ -9,6 +9,7 @@ QT.openvg.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenVG QT.openvg.private_includes = $$QT_MODULE_INCLUDE_BASE/QtOpenVG/private QT.openvg.sources = $$QT_MODULE_BASE/src/openvg @@ -254,10 +254,10 @@ index 19a9a81..1261fd9 100644 QT.openvg.imports = $$QT_MODULE_IMPORT_BASE QT.openvg.depends = core gui QT.openvg.CONFIG = openvg -diff --git a/qtkernel/src/modules/qt_sql.pri b/qtkernel/src/modules/qt_sql.pri +diff --git a/qtbase/src/modules/qt_sql.pri b/qtbase/src/modules/qt_sql.pri index c3950b1..e7ca42a 100644 ---- a/qtkernel/src/modules/qt_sql.pri -+++ b/qtkernel/src/modules/qt_sql.pri +--- a/qtbase/src/modules/qt_sql.pri ++++ b/qtbase/src/modules/qt_sql.pri @@ -9,6 +9,7 @@ QT.sql.includes = $$QT_MODULE_INCLUDE_BASE/QtSql QT.sql.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSql/private QT.sql.sources = $$QT_MODULE_BASE/src/sql @@ -266,10 +266,10 @@ index c3950b1..e7ca42a 100644 QT.sql.imports = $$QT_MODULE_IMPORT_BASE QT.sql.depends = core QT.sql.DEFINES = QT_SQL_LIB -diff --git a/qtkernel/src/modules/qt_testlib.pri b/qtkernel/src/modules/qt_testlib.pri +diff --git a/qtbase/src/modules/qt_testlib.pri b/qtbase/src/modules/qt_testlib.pri index a4f5dd2..6ef7939 100644 ---- a/qtkernel/src/modules/qt_testlib.pri -+++ b/qtkernel/src/modules/qt_testlib.pri +--- a/qtbase/src/modules/qt_testlib.pri ++++ b/qtbase/src/modules/qt_testlib.pri @@ -9,6 +9,7 @@ QT.testlib.includes = $$QT_MODULE_INCLUDE_BASE/QtTest QT.testlib.private_includes = $$QT_MODULE_INCLUDE_BASE/QtTest/private QT.testlib.sources = $$QT_MODULE_BASE/src/testlib @@ -278,10 +278,10 @@ index a4f5dd2..6ef7939 100644 QT.testlib.imports = $$QT_MODULE_IMPORT_BASE QT.testlib.depends = core QT.testlib.CONFIG = console -diff --git a/qtkernel/src/modules/qt_uilib.pri b/qtkernel/src/modules/qt_uilib.pri +diff --git a/qtbase/src/modules/qt_uilib.pri b/qtbase/src/modules/qt_uilib.pri index d1bd19a..7e1dc7c 100644 ---- a/qtkernel/src/modules/qt_uilib.pri -+++ b/qtkernel/src/modules/qt_uilib.pri +--- a/qtbase/src/modules/qt_uilib.pri ++++ b/qtbase/src/modules/qt_uilib.pri @@ -9,5 +9,6 @@ QT.uilib.includes = $$QT_MODULE_INCLUDE_BASE/QtDesigner QT.uilib.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDesigner/private QT.uilib.sources = $$QT_MODULE_BASE/tools/uilib @@ -289,10 +289,10 @@ index d1bd19a..7e1dc7c 100644 +QT.uilib.plugins = $$QT_MODULE_PLUGIN_BASE QT.uilib.imports = $$QT_MODULE_IMPORT_BASE QT.uilib.depends = xml -diff --git a/qtkernel/src/modules/qt_uitools.pri b/qtkernel/src/modules/qt_uitools.pri +diff --git a/qtbase/src/modules/qt_uitools.pri b/qtbase/src/modules/qt_uitools.pri index 5b71e27..d221007 100644 ---- a/qtkernel/src/modules/qt_uitools.pri -+++ b/qtkernel/src/modules/qt_uitools.pri +--- a/qtbase/src/modules/qt_uitools.pri ++++ b/qtbase/src/modules/qt_uitools.pri @@ -9,6 +9,7 @@ QT.uitools.includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools QT.uitools.private_includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools/private QT.uitools.sources = $$QT_MODULE_BASE/src/uitools @@ -301,10 +301,10 @@ index 5b71e27..d221007 100644 QT.uitools.imports = $$QT_MODULE_IMPORT_BASE QT.uitools.depends = xml QT.uitools.DEFINES = QT_UITOOLS_LIB -diff --git a/qtkernel/src/modules/qt_xml.pri b/qtkernel/src/modules/qt_xml.pri +diff --git a/qtbase/src/modules/qt_xml.pri b/qtbase/src/modules/qt_xml.pri index 95d9467..0ede3d2 100644 ---- a/qtkernel/src/modules/qt_xml.pri -+++ b/qtkernel/src/modules/qt_xml.pri +--- a/qtbase/src/modules/qt_xml.pri ++++ b/qtbase/src/modules/qt_xml.pri @@ -9,6 +9,7 @@ QT.xml.includes = $$QT_MODULE_INCLUDE_BASE/QtXml QT.xml.private_includes = $$QT_MODULE_INCLUDE_BASE/QtXml/private QT.xml.sources = $$QT_MODULE_BASE/src/xml @@ -313,10 +313,10 @@ index 95d9467..0ede3d2 100644 QT.xml.imports = $$QT_MODULE_IMPORT_BASE QT.xml.depends = core QT.xml.DEFINES = QT_XML_LIB -diff --git a/qtkernel/src/plugins/accessible/widgets/widgets.pro b/qtkernel/src/plugins/accessible/widgets/widgets.pro +diff --git a/qtbase/src/plugins/accessible/widgets/widgets.pro b/qtbase/src/plugins/accessible/widgets/widgets.pro index 79110cb..092f3ca 100644 ---- a/qtkernel/src/plugins/accessible/widgets/widgets.pro -+++ b/qtkernel/src/plugins/accessible/widgets/widgets.pro +--- a/qtbase/src/plugins/accessible/widgets/widgets.pro ++++ b/qtbase/src/plugins/accessible/widgets/widgets.pro @@ -2,7 +2,7 @@ TARGET = qtaccessiblewidgets include(../../qpluginbase.pri) include (../qaccessiblebase.pri) @@ -326,10 +326,10 @@ index 79110cb..092f3ca 100644 QTDIR_build:REQUIRES += "contains(QT_CONFIG, accessibility)" -diff --git a/qtkernel/src/plugins/bearer/connman/connman.pro b/qtkernel/src/plugins/bearer/connman/connman.pro +diff --git a/qtbase/src/plugins/bearer/connman/connman.pro b/qtbase/src/plugins/bearer/connman/connman.pro index dec408c..3ac54c3 100644 ---- a/qtkernel/src/plugins/bearer/connman/connman.pro -+++ b/qtkernel/src/plugins/bearer/connman/connman.pro +--- a/qtbase/src/plugins/bearer/connman/connman.pro ++++ b/qtbase/src/plugins/bearer/connman/connman.pro @@ -15,7 +15,7 @@ SOURCES += main.cpp \ qconnmanengine.cpp \ ../qnetworksession_impl.cpp @@ -339,10 +339,10 @@ index dec408c..3ac54c3 100644 target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target -diff --git a/qtkernel/src/plugins/bearer/corewlan/corewlan.pro b/qtkernel/src/plugins/bearer/corewlan/corewlan.pro +diff --git a/qtbase/src/plugins/bearer/corewlan/corewlan.pro b/qtbase/src/plugins/bearer/corewlan/corewlan.pro index 90078e9..ae5371a 100644 ---- a/qtkernel/src/plugins/bearer/corewlan/corewlan.pro -+++ b/qtkernel/src/plugins/bearer/corewlan/corewlan.pro +--- a/qtbase/src/plugins/bearer/corewlan/corewlan.pro ++++ b/qtbase/src/plugins/bearer/corewlan/corewlan.pro @@ -20,6 +20,6 @@ SOURCES += main.cpp \ OBJECTIVE_SOURCES += qcorewlanengine.mm @@ -351,10 +351,10 @@ index 90078e9..ae5371a 100644 +DESTDIR = $$QT.network.plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target -diff --git a/qtkernel/src/plugins/bearer/generic/generic.pro b/qtkernel/src/plugins/bearer/generic/generic.pro +diff --git a/qtbase/src/plugins/bearer/generic/generic.pro b/qtbase/src/plugins/bearer/generic/generic.pro index c967f8c..94ab36c 100644 ---- a/qtkernel/src/plugins/bearer/generic/generic.pro -+++ b/qtkernel/src/plugins/bearer/generic/generic.pro +--- a/qtbase/src/plugins/bearer/generic/generic.pro ++++ b/qtbase/src/plugins/bearer/generic/generic.pro @@ -11,6 +11,6 @@ SOURCES += qgenericengine.cpp \ ../qnetworksession_impl.cpp \ main.cpp @@ -363,10 +363,10 @@ index c967f8c..94ab36c 100644 +DESTDIR = $$QT.network.plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target -diff --git a/qtkernel/src/plugins/bearer/icd/icd.pro b/qtkernel/src/plugins/bearer/icd/icd.pro +diff --git a/qtbase/src/plugins/bearer/icd/icd.pro b/qtbase/src/plugins/bearer/icd/icd.pro index 6700cda..4737045 100644 ---- a/qtkernel/src/plugins/bearer/icd/icd.pro -+++ b/qtkernel/src/plugins/bearer/icd/icd.pro +--- a/qtbase/src/plugins/bearer/icd/icd.pro ++++ b/qtbase/src/plugins/bearer/icd/icd.pro @@ -28,6 +28,6 @@ SOURCES += main.cpp \ include(../../../3rdparty/libgq.pri) @@ -375,10 +375,10 @@ index 6700cda..4737045 100644 +DESTDIR = $$QT.network.plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target -diff --git a/qtkernel/src/plugins/bearer/nativewifi/nativewifi.pro b/qtkernel/src/plugins/bearer/nativewifi/nativewifi.pro +diff --git a/qtbase/src/plugins/bearer/nativewifi/nativewifi.pro b/qtbase/src/plugins/bearer/nativewifi/nativewifi.pro index 36dd36d..6df346c 100644 ---- a/qtkernel/src/plugins/bearer/nativewifi/nativewifi.pro -+++ b/qtkernel/src/plugins/bearer/nativewifi/nativewifi.pro +--- a/qtbase/src/plugins/bearer/nativewifi/nativewifi.pro ++++ b/qtbase/src/plugins/bearer/nativewifi/nativewifi.pro @@ -12,6 +12,6 @@ SOURCES += main.cpp \ qnativewifiengine.cpp \ ../qnetworksession_impl.cpp @@ -387,10 +387,10 @@ index 36dd36d..6df346c 100644 +DESTDIR = $$QT.network.plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target -diff --git a/qtkernel/src/plugins/bearer/networkmanager/networkmanager.pro b/qtkernel/src/plugins/bearer/networkmanager/networkmanager.pro +diff --git a/qtbase/src/plugins/bearer/networkmanager/networkmanager.pro b/qtbase/src/plugins/bearer/networkmanager/networkmanager.pro index e396263..b3e0883 100644 ---- a/qtkernel/src/plugins/bearer/networkmanager/networkmanager.pro -+++ b/qtkernel/src/plugins/bearer/networkmanager/networkmanager.pro +--- a/qtbase/src/plugins/bearer/networkmanager/networkmanager.pro ++++ b/qtbase/src/plugins/bearer/networkmanager/networkmanager.pro @@ -15,6 +15,6 @@ SOURCES += main.cpp \ qnetworkmanagerengine.cpp \ ../qnetworksession_impl.cpp @@ -399,10 +399,10 @@ index e396263..b3e0883 100644 +DESTDIR = $$QT.network.plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target -diff --git a/qtkernel/src/plugins/bearer/nla/nla.pro b/qtkernel/src/plugins/bearer/nla/nla.pro +diff --git a/qtbase/src/plugins/bearer/nla/nla.pro b/qtbase/src/plugins/bearer/nla/nla.pro index 5dfb6d7..ecf958f 100644 ---- a/qtkernel/src/plugins/bearer/nla/nla.pro -+++ b/qtkernel/src/plugins/bearer/nla/nla.pro +--- a/qtbase/src/plugins/bearer/nla/nla.pro ++++ b/qtbase/src/plugins/bearer/nla/nla.pro @@ -18,6 +18,6 @@ SOURCES += main.cpp \ qnlaengine.cpp \ ../qnetworksession_impl.cpp @@ -411,10 +411,10 @@ index 5dfb6d7..ecf958f 100644 +DESTDIR = $$QT.network.plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target -diff --git a/qtkernel/src/plugins/bearer/symbian/symbian.pri b/qtkernel/src/plugins/bearer/symbian/symbian.pri +diff --git a/qtbase/src/plugins/bearer/symbian/symbian.pri b/qtbase/src/plugins/bearer/symbian/symbian.pri index 8d92f57..5d2ae1a 100644 ---- a/qtkernel/src/plugins/bearer/symbian/symbian.pri -+++ b/qtkernel/src/plugins/bearer/symbian/symbian.pri +--- a/qtbase/src/plugins/bearer/symbian/symbian.pri ++++ b/qtbase/src/plugins/bearer/symbian/symbian.pri @@ -27,6 +27,6 @@ is_using_gnupoc { LIBS += -lConnMon } @@ -423,10 +423,10 @@ index 8d92f57..5d2ae1a 100644 +DESTDIR = $$QT.network.plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target -diff --git a/qtkernel/src/plugins/codecs/cn/cn.pro b/qtkernel/src/plugins/codecs/cn/cn.pro +diff --git a/qtbase/src/plugins/codecs/cn/cn.pro b/qtbase/src/plugins/codecs/cn/cn.pro index b0a8a91..51a2f41 100644 ---- a/qtkernel/src/plugins/codecs/cn/cn.pro -+++ b/qtkernel/src/plugins/codecs/cn/cn.pro +--- a/qtbase/src/plugins/codecs/cn/cn.pro ++++ b/qtbase/src/plugins/codecs/cn/cn.pro @@ -2,7 +2,7 @@ TARGET = qcncodecs include(../../qpluginbase.pri) @@ -436,10 +436,10 @@ index b0a8a91..51a2f41 100644 QT = core HEADERS = qgb18030codec.h -diff --git a/qtkernel/src/plugins/codecs/jp/jp.pro b/qtkernel/src/plugins/codecs/jp/jp.pro +diff --git a/qtbase/src/plugins/codecs/jp/jp.pro b/qtbase/src/plugins/codecs/jp/jp.pro index 6480e43..e6b7a4b 100644 ---- a/qtkernel/src/plugins/codecs/jp/jp.pro -+++ b/qtkernel/src/plugins/codecs/jp/jp.pro +--- a/qtbase/src/plugins/codecs/jp/jp.pro ++++ b/qtbase/src/plugins/codecs/jp/jp.pro @@ -2,7 +2,7 @@ TARGET = qjpcodecs include(../../qpluginbase.pri) @@ -449,10 +449,10 @@ index 6480e43..e6b7a4b 100644 QT = core HEADERS = qjpunicode.h \ -diff --git a/qtkernel/src/plugins/codecs/kr/kr.pro b/qtkernel/src/plugins/codecs/kr/kr.pro +diff --git a/qtbase/src/plugins/codecs/kr/kr.pro b/qtbase/src/plugins/codecs/kr/kr.pro index 1cc28d8..14c162c 100644 ---- a/qtkernel/src/plugins/codecs/kr/kr.pro -+++ b/qtkernel/src/plugins/codecs/kr/kr.pro +--- a/qtbase/src/plugins/codecs/kr/kr.pro ++++ b/qtbase/src/plugins/codecs/kr/kr.pro @@ -2,7 +2,7 @@ TARGET = qkrcodecs include(../../qpluginbase.pri) @@ -462,10 +462,10 @@ index 1cc28d8..14c162c 100644 QT = core HEADERS = qeuckrcodec.h \ -diff --git a/qtkernel/src/plugins/codecs/tw/tw.pro b/qtkernel/src/plugins/codecs/tw/tw.pro +diff --git a/qtbase/src/plugins/codecs/tw/tw.pro b/qtbase/src/plugins/codecs/tw/tw.pro index 2ebb94f..b0d5a2b 100644 ---- a/qtkernel/src/plugins/codecs/tw/tw.pro -+++ b/qtkernel/src/plugins/codecs/tw/tw.pro +--- a/qtbase/src/plugins/codecs/tw/tw.pro ++++ b/qtbase/src/plugins/codecs/tw/tw.pro @@ -2,7 +2,7 @@ TARGET = qtwcodecs include(../../qpluginbase.pri) @@ -475,10 +475,10 @@ index 2ebb94f..b0d5a2b 100644 QT = core HEADERS = qbig5codec.h -diff --git a/qtkernel/src/plugins/decorations/default/default.pro b/qtkernel/src/plugins/decorations/default/default.pro +diff --git a/qtbase/src/plugins/decorations/default/default.pro b/qtbase/src/plugins/decorations/default/default.pro index fb41d7f..a30899a 100644 ---- a/qtkernel/src/plugins/decorations/default/default.pro -+++ b/qtkernel/src/plugins/decorations/default/default.pro +--- a/qtbase/src/plugins/decorations/default/default.pro ++++ b/qtbase/src/plugins/decorations/default/default.pro @@ -5,6 +5,6 @@ HEADERS = $$QT_SOURCE_TREE/src/gui/embedded/qdecorationdefault_qws.h SOURCES = main.cpp \ $$QT_SOURCE_TREE/src/gui/embedded/qdecorationdefault_qws.cpp @@ -487,10 +487,10 @@ index fb41d7f..a30899a 100644 +DESTDIR = $$QT.gui.plugins/decorations target.path += $$[QT_INSTALL_PLUGINS]/decorations INSTALLS += target -diff --git a/qtkernel/src/plugins/decorations/styled/styled.pro b/qtkernel/src/plugins/decorations/styled/styled.pro +diff --git a/qtbase/src/plugins/decorations/styled/styled.pro b/qtbase/src/plugins/decorations/styled/styled.pro index 5879992..151ef88 100644 ---- a/qtkernel/src/plugins/decorations/styled/styled.pro -+++ b/qtkernel/src/plugins/decorations/styled/styled.pro +--- a/qtbase/src/plugins/decorations/styled/styled.pro ++++ b/qtbase/src/plugins/decorations/styled/styled.pro @@ -1,7 +1,7 @@ TARGET = qdecorationstyled include(../../qpluginbase.pri) @@ -500,10 +500,10 @@ index 5879992..151ef88 100644 target.path += $$[QT_INSTALL_PLUGINS]/decorations INSTALLS += target -diff --git a/qtkernel/src/plugins/decorations/windows/windows.pro b/qtkernel/src/plugins/decorations/windows/windows.pro +diff --git a/qtbase/src/plugins/decorations/windows/windows.pro b/qtbase/src/plugins/decorations/windows/windows.pro index 3cac77d..7f788a3 100644 ---- a/qtkernel/src/plugins/decorations/windows/windows.pro -+++ b/qtkernel/src/plugins/decorations/windows/windows.pro +--- a/qtbase/src/plugins/decorations/windows/windows.pro ++++ b/qtbase/src/plugins/decorations/windows/windows.pro @@ -5,6 +5,6 @@ HEADERS = $$QT_SOURCE_TREE/src/gui/embedded/qdecorationwindows_qws.h SOURCES = main.cpp \ $$QT_SOURCE_TREE/src/gui/embedded/qdecorationwindows_qws.cpp @@ -512,10 +512,10 @@ index 3cac77d..7f788a3 100644 +DESTDIR = $$QT.gui.plugins/decorations target.path += $$[QT_INSTALL_PLUGINS]/decorations INSTALLS += target -diff --git a/qtkernel/src/plugins/generic/linuxinput/linuxinput.pro b/qtkernel/src/plugins/generic/linuxinput/linuxinput.pro +diff --git a/qtbase/src/plugins/generic/linuxinput/linuxinput.pro b/qtbase/src/plugins/generic/linuxinput/linuxinput.pro index ad9f6a9..d4dc4bb 100644 ---- a/qtkernel/src/plugins/generic/linuxinput/linuxinput.pro -+++ b/qtkernel/src/plugins/generic/linuxinput/linuxinput.pro +--- a/qtbase/src/plugins/generic/linuxinput/linuxinput.pro ++++ b/qtbase/src/plugins/generic/linuxinput/linuxinput.pro @@ -1,7 +1,7 @@ TARGET = qlinuxinputplugin include(../../qpluginbase.pri) @@ -525,10 +525,10 @@ index ad9f6a9..d4dc4bb 100644 target.path = $$[QT_INSTALL_PLUGINS]/generic INSTALLS += target -diff --git a/qtkernel/src/plugins/generic/tslib/tslib.pro b/qtkernel/src/plugins/generic/tslib/tslib.pro +diff --git a/qtbase/src/plugins/generic/tslib/tslib.pro b/qtbase/src/plugins/generic/tslib/tslib.pro index 74c7fd2..4851521 100644 ---- a/qtkernel/src/plugins/generic/tslib/tslib.pro -+++ b/qtkernel/src/plugins/generic/tslib/tslib.pro +--- a/qtbase/src/plugins/generic/tslib/tslib.pro ++++ b/qtbase/src/plugins/generic/tslib/tslib.pro @@ -1,7 +1,7 @@ TARGET = qlinuxinputplugin include(../../qpluginbase.pri) @@ -538,10 +538,10 @@ index 74c7fd2..4851521 100644 target.path = $$[QT_INSTALL_PLUGINS]/generic INSTALLS += target -diff --git a/qtkernel/src/plugins/gfxdrivers/ahi/ahi.pro b/qtkernel/src/plugins/gfxdrivers/ahi/ahi.pro +diff --git a/qtbase/src/plugins/gfxdrivers/ahi/ahi.pro b/qtbase/src/plugins/gfxdrivers/ahi/ahi.pro index 6fc8a5c..3abe2a7 100644 ---- a/qtkernel/src/plugins/gfxdrivers/ahi/ahi.pro -+++ b/qtkernel/src/plugins/gfxdrivers/ahi/ahi.pro +--- a/qtbase/src/plugins/gfxdrivers/ahi/ahi.pro ++++ b/qtbase/src/plugins/gfxdrivers/ahi/ahi.pro @@ -1,7 +1,7 @@ TARGET = qahiscreen include(../../qpluginbase.pri) @@ -551,10 +551,10 @@ index 6fc8a5c..3abe2a7 100644 target.path = $$[QT_INSTALL_PLUGINS]/gfxdrivers INSTALLS += target -diff --git a/qtkernel/src/plugins/gfxdrivers/directfb/directfb.pro b/qtkernel/src/plugins/gfxdrivers/directfb/directfb.pro +diff --git a/qtbase/src/plugins/gfxdrivers/directfb/directfb.pro b/qtbase/src/plugins/gfxdrivers/directfb/directfb.pro index d397050..54d11ca 100644 ---- a/qtkernel/src/plugins/gfxdrivers/directfb/directfb.pro -+++ b/qtkernel/src/plugins/gfxdrivers/directfb/directfb.pro +--- a/qtbase/src/plugins/gfxdrivers/directfb/directfb.pro ++++ b/qtbase/src/plugins/gfxdrivers/directfb/directfb.pro @@ -2,7 +2,7 @@ TARGET = qdirectfbscreen include(../../qpluginbase.pri) include($$QT_SOURCE_TREE/src/gui/embedded/directfb.pri) @@ -564,10 +564,10 @@ index d397050..54d11ca 100644 target.path = $$[QT_INSTALL_PLUGINS]/gfxdrivers INSTALLS += target -diff --git a/qtkernel/src/plugins/gfxdrivers/eglnullws/eglnullws.pro b/qtkernel/src/plugins/gfxdrivers/eglnullws/eglnullws.pro +diff --git a/qtbase/src/plugins/gfxdrivers/eglnullws/eglnullws.pro b/qtbase/src/plugins/gfxdrivers/eglnullws/eglnullws.pro index 242ab07..30cebab 100644 ---- a/qtkernel/src/plugins/gfxdrivers/eglnullws/eglnullws.pro -+++ b/qtkernel/src/plugins/gfxdrivers/eglnullws/eglnullws.pro +--- a/qtbase/src/plugins/gfxdrivers/eglnullws/eglnullws.pro ++++ b/qtbase/src/plugins/gfxdrivers/eglnullws/eglnullws.pro @@ -4,7 +4,7 @@ include(../../qpluginbase.pri) CONFIG += warn_on QT += opengl @@ -577,10 +577,10 @@ index 242ab07..30cebab 100644 target.path = $$[QT_INSTALL_PLUGINS]/gfxdrivers INSTALLS += target -diff --git a/qtkernel/src/plugins/gfxdrivers/linuxfb/linuxfb.pro b/qtkernel/src/plugins/gfxdrivers/linuxfb/linuxfb.pro +diff --git a/qtbase/src/plugins/gfxdrivers/linuxfb/linuxfb.pro b/qtbase/src/plugins/gfxdrivers/linuxfb/linuxfb.pro index 2a376e4..c1cdc0e 100644 ---- a/qtkernel/src/plugins/gfxdrivers/linuxfb/linuxfb.pro -+++ b/qtkernel/src/plugins/gfxdrivers/linuxfb/linuxfb.pro +--- a/qtbase/src/plugins/gfxdrivers/linuxfb/linuxfb.pro ++++ b/qtbase/src/plugins/gfxdrivers/linuxfb/linuxfb.pro @@ -1,7 +1,7 @@ TARGET = qscreenlinuxfb include(../../qpluginbase.pri) @@ -590,10 +590,10 @@ index 2a376e4..c1cdc0e 100644 target.path = $$[QT_INSTALL_PLUGINS]/gfxdrivers INSTALLS += target -diff --git a/qtkernel/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.pro b/qtkernel/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.pro +diff --git a/qtbase/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.pro b/qtbase/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.pro index 675be85..2b5212a 100644 ---- a/qtkernel/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.pro -+++ b/qtkernel/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.pro +--- a/qtbase/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.pro ++++ b/qtbase/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.pro @@ -19,7 +19,7 @@ SOURCES = \ pvreglscreen.cpp \ pvreglwindowsurface.cpp @@ -603,10 +603,10 @@ index 675be85..2b5212a 100644 target.path = $$[QT_INSTALL_PLUGINS]/gfxdrivers INSTALLS += target -diff --git a/qtkernel/src/plugins/gfxdrivers/qvfb/qvfb.pro b/qtkernel/src/plugins/gfxdrivers/qvfb/qvfb.pro +diff --git a/qtbase/src/plugins/gfxdrivers/qvfb/qvfb.pro b/qtbase/src/plugins/gfxdrivers/qvfb/qvfb.pro index a0996e7..e45319d 100644 ---- a/qtkernel/src/plugins/gfxdrivers/qvfb/qvfb.pro -+++ b/qtkernel/src/plugins/gfxdrivers/qvfb/qvfb.pro +--- a/qtbase/src/plugins/gfxdrivers/qvfb/qvfb.pro ++++ b/qtbase/src/plugins/gfxdrivers/qvfb/qvfb.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) DEFINES += QT_QWS_QVFB QT_QWS_MOUSE_QVFB QT_QWS_KBD_QVFB @@ -616,10 +616,10 @@ index a0996e7..e45319d 100644 HEADERS = \ $$QT_SOURCE_TREE/src/gui/embedded/qscreenvfb_qws.h \ -diff --git a/qtkernel/src/plugins/gfxdrivers/transformed/transformed.pro b/qtkernel/src/plugins/gfxdrivers/transformed/transformed.pro +diff --git a/qtbase/src/plugins/gfxdrivers/transformed/transformed.pro b/qtbase/src/plugins/gfxdrivers/transformed/transformed.pro index 173f7e9..f6e0770 100644 ---- a/qtkernel/src/plugins/gfxdrivers/transformed/transformed.pro -+++ b/qtkernel/src/plugins/gfxdrivers/transformed/transformed.pro +--- a/qtbase/src/plugins/gfxdrivers/transformed/transformed.pro ++++ b/qtbase/src/plugins/gfxdrivers/transformed/transformed.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) DEFINES += QT_QWS_TRANSFORMED @@ -629,10 +629,10 @@ index 173f7e9..f6e0770 100644 HEADERS = $$QT_SOURCE_TREE/src/gui/embedded/qscreentransformed_qws.h SOURCES = main.cpp \ -diff --git a/qtkernel/src/plugins/gfxdrivers/vnc/vnc.pro b/qtkernel/src/plugins/gfxdrivers/vnc/vnc.pro +diff --git a/qtbase/src/plugins/gfxdrivers/vnc/vnc.pro b/qtbase/src/plugins/gfxdrivers/vnc/vnc.pro index 31da2f4..48bad8c 100644 ---- a/qtkernel/src/plugins/gfxdrivers/vnc/vnc.pro -+++ b/qtkernel/src/plugins/gfxdrivers/vnc/vnc.pro +--- a/qtbase/src/plugins/gfxdrivers/vnc/vnc.pro ++++ b/qtbase/src/plugins/gfxdrivers/vnc/vnc.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) DEFINES += QT_QWS_VNC @@ -642,10 +642,10 @@ index 31da2f4..48bad8c 100644 HEADERS = \ qscreenvnc_qws.h \ -diff --git a/qtkernel/src/plugins/graphicssystems/meego/meego.pro b/qtkernel/src/plugins/graphicssystems/meego/meego.pro +diff --git a/qtbase/src/plugins/graphicssystems/meego/meego.pro b/qtbase/src/plugins/graphicssystems/meego/meego.pro index 0d3cce6..c497ba2 100644 ---- a/qtkernel/src/plugins/graphicssystems/meego/meego.pro -+++ b/qtkernel/src/plugins/graphicssystems/meego/meego.pro +--- a/qtbase/src/plugins/graphicssystems/meego/meego.pro ++++ b/qtbase/src/plugins/graphicssystems/meego/meego.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) QT += gui opengl @@ -655,10 +655,10 @@ index 0d3cce6..c497ba2 100644 HEADERS = qmeegographicssystem.h qmeegopixmapdata.h qmeegoextensions.h qmeegorasterpixmapdata.h qmeegolivepixmapdata.h SOURCES = qmeegographicssystem.cpp qmeegographicssystem.h qmeegographicssystemplugin.h qmeegographicssystemplugin.cpp qmeegopixmapdata.h qmeegopixmapdata.cpp qmeegoextensions.h qmeegoextensions.cpp qmeegorasterpixmapdata.h qmeegorasterpixmapdata.cpp qmeegolivepixmapdata.cpp qmeegolivepixmapdata.h dithering.cpp -diff --git a/qtkernel/src/plugins/graphicssystems/opengl/opengl.pro b/qtkernel/src/plugins/graphicssystems/opengl/opengl.pro +diff --git a/qtbase/src/plugins/graphicssystems/opengl/opengl.pro b/qtbase/src/plugins/graphicssystems/opengl/opengl.pro index 47e15c5..fb3cb53 100644 ---- a/qtkernel/src/plugins/graphicssystems/opengl/opengl.pro -+++ b/qtkernel/src/plugins/graphicssystems/opengl/opengl.pro +--- a/qtbase/src/plugins/graphicssystems/opengl/opengl.pro ++++ b/qtbase/src/plugins/graphicssystems/opengl/opengl.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) QT += opengl @@ -668,10 +668,10 @@ index 47e15c5..fb3cb53 100644 SOURCES = main.cpp -diff --git a/qtkernel/src/plugins/graphicssystems/openvg/openvg.pro b/qtkernel/src/plugins/graphicssystems/openvg/openvg.pro +diff --git a/qtbase/src/plugins/graphicssystems/openvg/openvg.pro b/qtbase/src/plugins/graphicssystems/openvg/openvg.pro index 781cdc4..6f8b139 100644 ---- a/qtkernel/src/plugins/graphicssystems/openvg/openvg.pro -+++ b/qtkernel/src/plugins/graphicssystems/openvg/openvg.pro +--- a/qtbase/src/plugins/graphicssystems/openvg/openvg.pro ++++ b/qtbase/src/plugins/graphicssystems/openvg/openvg.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) QT += openvg @@ -681,10 +681,10 @@ index 781cdc4..6f8b139 100644 SOURCES = main.cpp qgraphicssystem_vg.cpp HEADERS = qgraphicssystem_vg_p.h -diff --git a/qtkernel/src/plugins/graphicssystems/shivavg/shivavg.pro b/qtkernel/src/plugins/graphicssystems/shivavg/shivavg.pro +diff --git a/qtbase/src/plugins/graphicssystems/shivavg/shivavg.pro b/qtbase/src/plugins/graphicssystems/shivavg/shivavg.pro index b8ea12a..6bf9d7a 100644 ---- a/qtkernel/src/plugins/graphicssystems/shivavg/shivavg.pro -+++ b/qtkernel/src/plugins/graphicssystems/shivavg/shivavg.pro +--- a/qtbase/src/plugins/graphicssystems/shivavg/shivavg.pro ++++ b/qtbase/src/plugins/graphicssystems/shivavg/shivavg.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) QT += openvg @@ -694,10 +694,10 @@ index b8ea12a..6bf9d7a 100644 SOURCES = main.cpp shivavggraphicssystem.cpp shivavgwindowsurface.cpp HEADERS = shivavggraphicssystem.h shivavgwindowsurface.h -diff --git a/qtkernel/src/plugins/graphicssystems/trace/trace.pro b/qtkernel/src/plugins/graphicssystems/trace/trace.pro +diff --git a/qtbase/src/plugins/graphicssystems/trace/trace.pro b/qtbase/src/plugins/graphicssystems/trace/trace.pro index 07472e2..0958a86 100644 ---- a/qtkernel/src/plugins/graphicssystems/trace/trace.pro -+++ b/qtkernel/src/plugins/graphicssystems/trace/trace.pro +--- a/qtbase/src/plugins/graphicssystems/trace/trace.pro ++++ b/qtbase/src/plugins/graphicssystems/trace/trace.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) QT += network @@ -707,10 +707,10 @@ index 07472e2..0958a86 100644 symbian:TARGET.UID3 = 0x2002130E SOURCES = main.cpp qgraphicssystem_trace.cpp -diff --git a/qtkernel/src/plugins/imageformats/gif/gif.pro b/qtkernel/src/plugins/imageformats/gif/gif.pro +diff --git a/qtbase/src/plugins/imageformats/gif/gif.pro b/qtbase/src/plugins/imageformats/gif/gif.pro index 439b431..4b72cae 100644 ---- a/qtkernel/src/plugins/imageformats/gif/gif.pro -+++ b/qtkernel/src/plugins/imageformats/gif/gif.pro +--- a/qtbase/src/plugins/imageformats/gif/gif.pro ++++ b/qtbase/src/plugins/imageformats/gif/gif.pro @@ -4,7 +4,7 @@ include(../../qpluginbase.pri) include(../../../gui/image/qgifhandler.pri) SOURCES += $$PWD/main.cpp @@ -720,10 +720,10 @@ index 439b431..4b72cae 100644 target.path += $$[QT_INSTALL_PLUGINS]/imageformats INSTALLS += target -diff --git a/qtkernel/src/plugins/imageformats/ico/ico.pro b/qtkernel/src/plugins/imageformats/ico/ico.pro +diff --git a/qtbase/src/plugins/imageformats/ico/ico.pro b/qtbase/src/plugins/imageformats/ico/ico.pro index eadff41..cef92ce 100644 ---- a/qtkernel/src/plugins/imageformats/ico/ico.pro -+++ b/qtkernel/src/plugins/imageformats/ico/ico.pro +--- a/qtbase/src/plugins/imageformats/ico/ico.pro ++++ b/qtbase/src/plugins/imageformats/ico/ico.pro @@ -7,7 +7,7 @@ HEADERS += qicohandler.h SOURCES += main.cpp \ qicohandler.cpp @@ -733,10 +733,10 @@ index eadff41..cef92ce 100644 target.path += $$[QT_INSTALL_PLUGINS]/imageformats INSTALLS += target -diff --git a/qtkernel/src/plugins/imageformats/jpeg/jpeg.pro b/qtkernel/src/plugins/imageformats/jpeg/jpeg.pro +diff --git a/qtbase/src/plugins/imageformats/jpeg/jpeg.pro b/qtbase/src/plugins/imageformats/jpeg/jpeg.pro index fb254b8..3a0e875 100644 ---- a/qtkernel/src/plugins/imageformats/jpeg/jpeg.pro -+++ b/qtkernel/src/plugins/imageformats/jpeg/jpeg.pro +--- a/qtbase/src/plugins/imageformats/jpeg/jpeg.pro ++++ b/qtbase/src/plugins/imageformats/jpeg/jpeg.pro @@ -6,6 +6,6 @@ QTDIR_build:REQUIRES = "!contains(QT_CONFIG, no-jpeg)" include(../../../gui/image/qjpeghandler.pri) SOURCES += main.cpp @@ -745,10 +745,10 @@ index fb254b8..3a0e875 100644 +DESTDIR = $$QT.gui.plugins/imageformats target.path += $$[QT_INSTALL_PLUGINS]/imageformats INSTALLS += target -diff --git a/qtkernel/src/plugins/imageformats/mng/mng.pro b/qtkernel/src/plugins/imageformats/mng/mng.pro +diff --git a/qtbase/src/plugins/imageformats/mng/mng.pro b/qtbase/src/plugins/imageformats/mng/mng.pro index 88085f3..01dc418 100644 ---- a/qtkernel/src/plugins/imageformats/mng/mng.pro -+++ b/qtkernel/src/plugins/imageformats/mng/mng.pro +--- a/qtbase/src/plugins/imageformats/mng/mng.pro ++++ b/qtbase/src/plugins/imageformats/mng/mng.pro @@ -12,6 +12,6 @@ symbian: { include(../../../gui/image/qmnghandler.pri) SOURCES += main.cpp @@ -757,10 +757,10 @@ index 88085f3..01dc418 100644 +DESTDIR = $$QT.gui.plugins/imageformats target.path += $$[QT_INSTALL_PLUGINS]/imageformats INSTALLS += target -diff --git a/qtkernel/src/plugins/imageformats/tiff/tiff.pro b/qtkernel/src/plugins/imageformats/tiff/tiff.pro +diff --git a/qtbase/src/plugins/imageformats/tiff/tiff.pro b/qtbase/src/plugins/imageformats/tiff/tiff.pro index e781526..e4eb21b 100644 ---- a/qtkernel/src/plugins/imageformats/tiff/tiff.pro -+++ b/qtkernel/src/plugins/imageformats/tiff/tiff.pro +--- a/qtbase/src/plugins/imageformats/tiff/tiff.pro ++++ b/qtbase/src/plugins/imageformats/tiff/tiff.pro @@ -6,7 +6,7 @@ QTDIR_build:REQUIRES = "!contains(QT_CONFIG, no-tiff)" include(../../../gui/image/qtiffhandler.pri) SOURCES += main.cpp @@ -770,10 +770,10 @@ index e781526..e4eb21b 100644 target.path += $$[QT_INSTALL_PLUGINS]/imageformats INSTALLS += target -diff --git a/qtkernel/src/plugins/inputmethods/imsw-multi/imsw-multi.pro b/qtkernel/src/plugins/inputmethods/imsw-multi/imsw-multi.pro +diff --git a/qtbase/src/plugins/inputmethods/imsw-multi/imsw-multi.pro b/qtbase/src/plugins/inputmethods/imsw-multi/imsw-multi.pro index f8dcb2c..5d0535f 100644 ---- a/qtkernel/src/plugins/inputmethods/imsw-multi/imsw-multi.pro -+++ b/qtkernel/src/plugins/inputmethods/imsw-multi/imsw-multi.pro +--- a/qtbase/src/plugins/inputmethods/imsw-multi/imsw-multi.pro ++++ b/qtbase/src/plugins/inputmethods/imsw-multi/imsw-multi.pro @@ -2,7 +2,7 @@ TARGET = qimsw-multi include(../../qpluginbase.pri) CONFIG += warn_on @@ -783,10 +783,10 @@ index f8dcb2c..5d0535f 100644 HEADERS += qmultiinputcontext.h \ qmultiinputcontextplugin.h -diff --git a/qtkernel/src/plugins/kbddrivers/linuxinput/linuxinput.pro b/qtkernel/src/plugins/kbddrivers/linuxinput/linuxinput.pro +diff --git a/qtbase/src/plugins/kbddrivers/linuxinput/linuxinput.pro b/qtbase/src/plugins/kbddrivers/linuxinput/linuxinput.pro index 862a220..c0af91c 100644 ---- a/qtkernel/src/plugins/kbddrivers/linuxinput/linuxinput.pro -+++ b/qtkernel/src/plugins/kbddrivers/linuxinput/linuxinput.pro +--- a/qtbase/src/plugins/kbddrivers/linuxinput/linuxinput.pro ++++ b/qtbase/src/plugins/kbddrivers/linuxinput/linuxinput.pro @@ -1,7 +1,7 @@ TARGET = qlinuxinputkbddriver include(../../qpluginbase.pri) @@ -796,10 +796,10 @@ index 862a220..c0af91c 100644 target.path = $$[QT_INSTALL_PLUGINS]/kbddrivers INSTALLS += target -diff --git a/qtkernel/src/plugins/mousedrivers/linuxtp/linuxtp.pro b/qtkernel/src/plugins/mousedrivers/linuxtp/linuxtp.pro +diff --git a/qtbase/src/plugins/mousedrivers/linuxtp/linuxtp.pro b/qtbase/src/plugins/mousedrivers/linuxtp/linuxtp.pro index ac1c8ff..b8e26b4 100644 ---- a/qtkernel/src/plugins/mousedrivers/linuxtp/linuxtp.pro -+++ b/qtkernel/src/plugins/mousedrivers/linuxtp/linuxtp.pro +--- a/qtbase/src/plugins/mousedrivers/linuxtp/linuxtp.pro ++++ b/qtbase/src/plugins/mousedrivers/linuxtp/linuxtp.pro @@ -1,7 +1,7 @@ TARGET = qlinuxtpmousedriver include(../../qpluginbase.pri) @@ -809,10 +809,10 @@ index ac1c8ff..b8e26b4 100644 target.path = $$[QT_INSTALL_PLUGINS]/mousedrivers INSTALLS += target -diff --git a/qtkernel/src/plugins/mousedrivers/pc/pc.pro b/qtkernel/src/plugins/mousedrivers/pc/pc.pro +diff --git a/qtbase/src/plugins/mousedrivers/pc/pc.pro b/qtbase/src/plugins/mousedrivers/pc/pc.pro index b93b25b..d38e3fe 100644 ---- a/qtkernel/src/plugins/mousedrivers/pc/pc.pro -+++ b/qtkernel/src/plugins/mousedrivers/pc/pc.pro +--- a/qtbase/src/plugins/mousedrivers/pc/pc.pro ++++ b/qtbase/src/plugins/mousedrivers/pc/pc.pro @@ -1,7 +1,7 @@ TARGET = qpcmousedriver include(../../qpluginbase.pri) @@ -822,10 +822,10 @@ index b93b25b..d38e3fe 100644 target.path = $$[QT_INSTALL_PLUGINS]/mousedrivers INSTALLS += target -diff --git a/qtkernel/src/plugins/mousedrivers/tslib/tslib.pro b/qtkernel/src/plugins/mousedrivers/tslib/tslib.pro +diff --git a/qtbase/src/plugins/mousedrivers/tslib/tslib.pro b/qtbase/src/plugins/mousedrivers/tslib/tslib.pro index 7b0748d..e2fa013 100644 ---- a/qtkernel/src/plugins/mousedrivers/tslib/tslib.pro -+++ b/qtkernel/src/plugins/mousedrivers/tslib/tslib.pro +--- a/qtbase/src/plugins/mousedrivers/tslib/tslib.pro ++++ b/qtbase/src/plugins/mousedrivers/tslib/tslib.pro @@ -1,7 +1,7 @@ TARGET = qtslibmousedriver include(../../qpluginbase.pri) @@ -835,10 +835,10 @@ index 7b0748d..e2fa013 100644 HEADERS = \ $$QT_SOURCE_TREE/src/gui/embedded/qmousedriverplugin_qws.h \ -diff --git a/qtkernel/src/plugins/platforms/cocoa/cocoa.pro b/qtkernel/src/plugins/platforms/cocoa/cocoa.pro +diff --git a/qtbase/src/plugins/platforms/cocoa/cocoa.pro b/qtbase/src/plugins/platforms/cocoa/cocoa.pro index 1633ee4..705e604 100644 ---- a/qtkernel/src/plugins/platforms/cocoa/cocoa.pro -+++ b/qtkernel/src/plugins/platforms/cocoa/cocoa.pro +--- a/qtbase/src/plugins/platforms/cocoa/cocoa.pro ++++ b/qtbase/src/plugins/platforms/cocoa/cocoa.pro @@ -1,6 +1,6 @@ TARGET = qcocoa include(../../qpluginbase.pri) @@ -847,10 +847,10 @@ index 1633ee4..705e604 100644 OBJECTIVE_SOURCES = main.mm \ qcocoaintegration.mm \ -diff --git a/qtkernel/src/plugins/platforms/directfb/directfb.pro b/qtkernel/src/plugins/platforms/directfb/directfb.pro +diff --git a/qtbase/src/plugins/platforms/directfb/directfb.pro b/qtbase/src/plugins/platforms/directfb/directfb.pro index 65c49e3..4a63746 100644 ---- a/qtkernel/src/plugins/platforms/directfb/directfb.pro -+++ b/qtkernel/src/plugins/platforms/directfb/directfb.pro +--- a/qtbase/src/plugins/platforms/directfb/directfb.pro ++++ b/qtbase/src/plugins/platforms/directfb/directfb.pro @@ -1,6 +1,6 @@ TARGET = qdirectfb include(../../qpluginbase.pri) @@ -859,10 +859,10 @@ index 65c49e3..4a63746 100644 isEmpty(DIRECTFB_LIBS) { DIRECTFB_LIBS = -ldirectfb -lfusion -ldirect -lpthread -diff --git a/qtkernel/src/plugins/platforms/eglfs/eglfs.pro b/qtkernel/src/plugins/platforms/eglfs/eglfs.pro +diff --git a/qtbase/src/plugins/platforms/eglfs/eglfs.pro b/qtbase/src/plugins/platforms/eglfs/eglfs.pro index 7ad8fd9..3692e38 100644 ---- a/qtkernel/src/plugins/platforms/eglfs/eglfs.pro -+++ b/qtkernel/src/plugins/platforms/eglfs/eglfs.pro +--- a/qtbase/src/plugins/platforms/eglfs/eglfs.pro ++++ b/qtbase/src/plugins/platforms/eglfs/eglfs.pro @@ -4,7 +4,7 @@ CONFIG += plugin QT += opengl @@ -872,10 +872,10 @@ index 7ad8fd9..3692e38 100644 #DEFINES += QEGL_EXTRA_DEBUG -diff --git a/qtkernel/src/plugins/platforms/fb_base/fb_base.pro b/qtkernel/src/plugins/platforms/fb_base/fb_base.pro +diff --git a/qtbase/src/plugins/platforms/fb_base/fb_base.pro b/qtbase/src/plugins/platforms/fb_base/fb_base.pro index e08c0c5..4445516 100644 ---- a/qtkernel/src/plugins/platforms/fb_base/fb_base.pro -+++ b/qtkernel/src/plugins/platforms/fb_base/fb_base.pro +--- a/qtbase/src/plugins/platforms/fb_base/fb_base.pro ++++ b/qtbase/src/plugins/platforms/fb_base/fb_base.pro @@ -8,7 +8,7 @@ TARGET = fb_base #include(../../qpluginbase.pri) @@ -885,10 +885,10 @@ index e08c0c5..4445516 100644 TEMPLATE = lib -diff --git a/qtkernel/src/plugins/platforms/linuxfb/linuxfb.pro b/qtkernel/src/plugins/platforms/linuxfb/linuxfb.pro +diff --git a/qtbase/src/plugins/platforms/linuxfb/linuxfb.pro b/qtbase/src/plugins/platforms/linuxfb/linuxfb.pro index 216b899..4e4fe6f 100644 ---- a/qtkernel/src/plugins/platforms/linuxfb/linuxfb.pro -+++ b/qtkernel/src/plugins/platforms/linuxfb/linuxfb.pro +--- a/qtbase/src/plugins/platforms/linuxfb/linuxfb.pro ++++ b/qtbase/src/plugins/platforms/linuxfb/linuxfb.pro @@ -1,7 +1,7 @@ TARGET = qlinuxfbgraphicssystem include(../../qpluginbase.pri) @@ -898,10 +898,10 @@ index 216b899..4e4fe6f 100644 SOURCES = main.cpp qlinuxfbintegration.cpp HEADERS = qlinuxfbintegration.h -diff --git a/qtkernel/src/plugins/platforms/minimal/minimal.pro b/qtkernel/src/plugins/platforms/minimal/minimal.pro +diff --git a/qtbase/src/plugins/platforms/minimal/minimal.pro b/qtbase/src/plugins/platforms/minimal/minimal.pro index 438a88e..c832938 100644 ---- a/qtkernel/src/plugins/platforms/minimal/minimal.pro -+++ b/qtkernel/src/plugins/platforms/minimal/minimal.pro +--- a/qtbase/src/plugins/platforms/minimal/minimal.pro ++++ b/qtbase/src/plugins/platforms/minimal/minimal.pro @@ -1,7 +1,7 @@ TARGET = qminimal include(../../qpluginbase.pri) @@ -911,10 +911,10 @@ index 438a88e..c832938 100644 SOURCES = main.cpp \ qminimalintegration.cpp \ -diff --git a/qtkernel/src/plugins/platforms/openkode/openkode.pro b/qtkernel/src/plugins/platforms/openkode/openkode.pro +diff --git a/qtbase/src/plugins/platforms/openkode/openkode.pro b/qtbase/src/plugins/platforms/openkode/openkode.pro index c8ae415..a6e7d76 100644 ---- a/qtkernel/src/plugins/platforms/openkode/openkode.pro -+++ b/qtkernel/src/plugins/platforms/openkode/openkode.pro +--- a/qtbase/src/plugins/platforms/openkode/openkode.pro ++++ b/qtbase/src/plugins/platforms/openkode/openkode.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) QT += opengl @@ -924,10 +924,10 @@ index c8ae415..a6e7d76 100644 SOURCES = main.cpp \ qopenkodeintegration.cpp \ -diff --git a/qtkernel/src/plugins/platforms/openvglite/openvglite.pro b/qtkernel/src/plugins/platforms/openvglite/openvglite.pro +diff --git a/qtbase/src/plugins/platforms/openvglite/openvglite.pro b/qtbase/src/plugins/platforms/openvglite/openvglite.pro index 9d7860a..11e867d 100644 ---- a/qtkernel/src/plugins/platforms/openvglite/openvglite.pro -+++ b/qtkernel/src/plugins/platforms/openvglite/openvglite.pro +--- a/qtbase/src/plugins/platforms/openvglite/openvglite.pro ++++ b/qtbase/src/plugins/platforms/openvglite/openvglite.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) QT += openvg @@ -937,10 +937,10 @@ index 9d7860a..11e867d 100644 SOURCES = main.cpp qgraphicssystem_vglite.cpp qwindowsurface_vglite.cpp HEADERS = qgraphicssystem_vglite.h qwindowsurface_vglite.h -diff --git a/qtkernel/src/plugins/platforms/qvfb/qvfb.pro b/qtkernel/src/plugins/platforms/qvfb/qvfb.pro +diff --git a/qtbase/src/plugins/platforms/qvfb/qvfb.pro b/qtbase/src/plugins/platforms/qvfb/qvfb.pro index d2b332a..bc17525 100644 ---- a/qtkernel/src/plugins/platforms/qvfb/qvfb.pro -+++ b/qtkernel/src/plugins/platforms/qvfb/qvfb.pro +--- a/qtbase/src/plugins/platforms/qvfb/qvfb.pro ++++ b/qtbase/src/plugins/platforms/qvfb/qvfb.pro @@ -1,7 +1,7 @@ TARGET = qvfbintegration include(../../qpluginbase.pri) @@ -950,10 +950,10 @@ index d2b332a..bc17525 100644 SOURCES = main.cpp qvfbintegration.cpp qvfbwindowsurface.cpp -diff --git a/qtkernel/src/plugins/platforms/vnc/vnc.pro b/qtkernel/src/plugins/platforms/vnc/vnc.pro +diff --git a/qtbase/src/plugins/platforms/vnc/vnc.pro b/qtbase/src/plugins/platforms/vnc/vnc.pro index 07f8d88..a7b8ca5 100644 ---- a/qtkernel/src/plugins/platforms/vnc/vnc.pro -+++ b/qtkernel/src/plugins/platforms/vnc/vnc.pro +--- a/qtbase/src/plugins/platforms/vnc/vnc.pro ++++ b/qtbase/src/plugins/platforms/vnc/vnc.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) QT += network @@ -963,10 +963,10 @@ index 07f8d88..a7b8ca5 100644 SOURCES = main.cpp qvncintegration.cpp HEADERS = qvncintegration.h -diff --git a/qtkernel/src/plugins/platforms/wayland/wayland.pro b/qtkernel/src/plugins/platforms/wayland/wayland.pro +diff --git a/qtbase/src/plugins/platforms/wayland/wayland.pro b/qtbase/src/plugins/platforms/wayland/wayland.pro index face860..92350c0 100644 ---- a/qtkernel/src/plugins/platforms/wayland/wayland.pro -+++ b/qtkernel/src/plugins/platforms/wayland/wayland.pro +--- a/qtbase/src/plugins/platforms/wayland/wayland.pro ++++ b/qtbase/src/plugins/platforms/wayland/wayland.pro @@ -1,7 +1,7 @@ TARGET = qwayland include(../../qpluginbase.pri) @@ -976,10 +976,10 @@ index face860..92350c0 100644 DEFINES += Q_PLATFORM_WAYLAND DEFINES += $$QMAKE_DEFINES_WAYLAND -diff --git a/qtkernel/src/plugins/platforms/xlib/xlib.pro b/qtkernel/src/plugins/platforms/xlib/xlib.pro +diff --git a/qtbase/src/plugins/platforms/xlib/xlib.pro b/qtbase/src/plugins/platforms/xlib/xlib.pro index 159fdbe..22b27d8 100644 ---- a/qtkernel/src/plugins/platforms/xlib/xlib.pro -+++ b/qtkernel/src/plugins/platforms/xlib/xlib.pro +--- a/qtbase/src/plugins/platforms/xlib/xlib.pro ++++ b/qtbase/src/plugins/platforms/xlib/xlib.pro @@ -1,7 +1,7 @@ TARGET = qxlib @@ -989,10 +989,10 @@ index 159fdbe..22b27d8 100644 SOURCES = \ main.cpp \ -diff --git a/qtkernel/src/plugins/s60/s60pluginbase.pri b/qtkernel/src/plugins/s60/s60pluginbase.pri +diff --git a/qtbase/src/plugins/s60/s60pluginbase.pri b/qtbase/src/plugins/s60/s60pluginbase.pri index 4e15102..0cde7d2 100644 ---- a/qtkernel/src/plugins/s60/s60pluginbase.pri -+++ b/qtkernel/src/plugins/s60/s60pluginbase.pri +--- a/qtbase/src/plugins/s60/s60pluginbase.pri ++++ b/qtbase/src/plugins/s60/s60pluginbase.pri @@ -4,7 +4,7 @@ include(../qpluginbase.pri) CONFIG -= plugin @@ -1002,10 +1002,10 @@ index 4e15102..0cde7d2 100644 MMP_RULES += NOEXPORTLIBRARY -diff --git a/qtkernel/src/plugins/sqldrivers/qsqldriverbase.pri b/qtkernel/src/plugins/sqldrivers/qsqldriverbase.pri +diff --git a/qtbase/src/plugins/sqldrivers/qsqldriverbase.pri b/qtbase/src/plugins/sqldrivers/qsqldriverbase.pri index 2f6943a..64f55fd 100644 ---- a/qtkernel/src/plugins/sqldrivers/qsqldriverbase.pri -+++ b/qtkernel/src/plugins/sqldrivers/qsqldriverbase.pri +--- a/qtbase/src/plugins/sqldrivers/qsqldriverbase.pri ++++ b/qtbase/src/plugins/sqldrivers/qsqldriverbase.pri @@ -1,6 +1,6 @@ include(../qpluginbase.pri) QT = core sql diff --git a/patches/0100-Modularized-tst_bic-and-add-some-helper-functions-fo.patch b/patches/0100-Modularized-tst_bic-and-add-some-helper-functions-fo.patch index 9550162..fe52a85 100644 --- a/patches/0100-Modularized-tst_bic-and-add-some-helper-functions-fo.patch +++ b/patches/0100-Modularized-tst_bic-and-add-some-helper-functions-fo.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Modularized tst_bic and add some helper functions for global te --- phonon/tests/global/global.cfg | 5 + qt3support/tests/global/global.cfg | 5 + - qtkernel/tests/global/global.cfg | 12 +++ + qtbase/tests/global/global.cfg | 12 +++ qtmultimedia/tests/global/global.cfg | 5 + qtqa/tests/auto/bic/bic.pro | 1 + qtqa/tests/auto/bic/tst_bic.cpp | 66 ++++++------- @@ -19,7 +19,7 @@ Subject: [PATCH] Modularized tst_bic and add some helper functions for global te 12 files changed, 261 insertions(+), 35 deletions(-) create mode 100644 phonon/tests/global/global.cfg create mode 100644 qt3support/tests/global/global.cfg - create mode 100644 qtkernel/tests/global/global.cfg + create mode 100644 qtbase/tests/global/global.cfg create mode 100644 qtmultimedia/tests/global/global.cfg create mode 100644 qtqa/tests/shared/global.h create mode 100644 qtdeclarative/tests/global/global.cfg @@ -50,11 +50,11 @@ index 0000000..7eaa88b +<module name="Qt3Support" qtname="qt3support"/> +</modules> +</config> -diff --git a/qtkernel/tests/global/global.cfg b/qtkernel/tests/global/global.cfg +diff --git a/qtbase/tests/global/global.cfg b/qtbase/tests/global/global.cfg new file mode 100644 index 0000000..f39f4a0 --- /dev/null -+++ b/qtkernel/tests/global/global.cfg ++++ b/qtbase/tests/global/global.cfg @@ -0,0 +1,12 @@ +<config> +<modules> diff --git a/patches/0102-Modularized-tst_compilerwarnings.patch b/patches/0102-Modularized-tst_compilerwarnings.patch index 620455c..60eda17 100644 --- a/patches/0102-Modularized-tst_compilerwarnings.patch +++ b/patches/0102-Modularized-tst_compilerwarnings.patch @@ -19,7 +19,7 @@ Subject: [PATCH] Modularized tst_compilerwarnings 12 files changed, 69 insertions(+), 181 deletions(-) copy {qtqa/tests/auto/compilerwarnings => phonon/tests/auto/compilerwarnings/data}/test_cpp.txt (81%) copy {qtqa/tests/auto/compilerwarnings => qt3support/tests/auto/compilerwarnings/data}/test_cpp.txt (81%) - copy {qtqa/tests/auto/compilerwarnings => qtkernel/tests/auto/compilerwarnings/data}/test_cpp.txt (96%) + copy {qtqa/tests/auto/compilerwarnings => qtbase/tests/auto/compilerwarnings/data}/test_cpp.txt (96%) copy {qtqa/tests/auto/compilerwarnings => qtmultimedia/tests/auto/compilerwarnings/data}/test_cpp.txt (81%) delete mode 100644 qtqa/tests/auto/compilerwarnings/compilerwarnings.qrc copy {qtqa/tests/auto/compilerwarnings => qtdeclarative/tests/auto/compilerwarnings/data}/test_cpp.txt (83%) @@ -110,13 +110,13 @@ index d27e972..1c52f27 100644 } #endif - -diff --git a/qtqa/tests/auto/compilerwarnings/test_cpp.txt b/qtkernel/tests/auto/compilerwarnings/data/test_cpp.txt +diff --git a/qtqa/tests/auto/compilerwarnings/test_cpp.txt b/qtbase/tests/auto/compilerwarnings/data/test_cpp.txt similarity index 96% copy from qtqa/tests/auto/compilerwarnings/test_cpp.txt -copy to qtkernel/tests/auto/compilerwarnings/data/test_cpp.txt +copy to qtbase/tests/auto/compilerwarnings/data/test_cpp.txt index d27e972..9b8d11c 100644 --- a/qtqa/tests/auto/compilerwarnings/test_cpp.txt -+++ b/qtkernel/tests/auto/compilerwarnings/data/test_cpp.txt ++++ b/qtbase/tests/auto/compilerwarnings/data/test_cpp.txt @@ -44,22 +44,22 @@ #include <QtNetwork/QtNetwork> #include <QtXml/QtXml> diff --git a/patches/0103-Modularized-tst_symbols.patch b/patches/0103-Modularized-tst_symbols.patch index a02a29f..6b0984b 100644 --- a/patches/0103-Modularized-tst_symbols.patch +++ b/patches/0103-Modularized-tst_symbols.patch @@ -45,7 +45,7 @@ index db1cbea..d1f7a6b 100644 + +private: + QString qtModuleDir; -+ QString qtKernelDir; ++ QString qtBaseDir; + QHash<QString, QString> modules; + QStringList keys; }; @@ -60,8 +60,8 @@ index db1cbea..d1f7a6b 100644 + + QVERIFY2(modules.size() > 0, "Something is wrong in the global config file."); + -+ qtKernelDir = QString::fromLocal8Bit(qgetenv("QT_MODULE_KERNEL")); -+ QVERIFY2(!qtKernelDir.isEmpty(), "This test needs $QT_MODULE_KERNEL, we need it to search libs."); ++ qtBaseDir = QString::fromLocal8Bit(qgetenv("QT_MODULE_KERNEL")); ++ QVERIFY2(!qtBaseDir.isEmpty(), "This test needs $QT_MODULE_KERNEL, we need it to search libs."); + + keys = modules.keys(); + QList<QString>::iterator i; @@ -82,7 +82,7 @@ index db1cbea..d1f7a6b 100644 bool isFailed = false; - QDir dir(QLibraryInfo::location(QLibraryInfo::LibrariesPath), "*.so"); -+ QDir dir(qtKernelDir + "/lib", "*.so"); ++ QDir dir(qtBaseDir + "/lib", "*.so"); QStringList files = dir.entryList(); QVERIFY(!files.isEmpty()); @@ -108,7 +108,7 @@ index db1cbea..d1f7a6b 100644 QStringList() << ns + "Phonon"; - QDir dir(qgetenv("QTDIR") + "/lib", "*.so"); -+ QDir dir(qtKernelDir + "/lib", "*.so"); ++ QDir dir(qtBaseDir + "/lib", "*.so"); QStringList files = dir.entryList(); QVERIFY(!files.isEmpty()); diff --git a/patches/0105-Add-tst_headersclean-for-each-module.patch b/patches/0105-Add-tst_headersclean-for-each-module.patch index ffe2acd..089e6a7 100644 --- a/patches/0105-Add-tst_headersclean-for-each-module.patch +++ b/patches/0105-Add-tst_headersclean-for-each-module.patch @@ -12,9 +12,9 @@ Subject: [PATCH] Add tst_headersclean for each module .../tests/auto/headersclean/headersclean.pro | 5 + .../tests/auto/headersclean/tst_headersclean.cpp | 62 +++++++++++++++ .../auto.pro => qt3support/tests/auto/host.pro | 3 +- - qtkernel/tests/auto/headersclean/headersclean.pro | 7 ++ + qtbase/tests/auto/headersclean/headersclean.pro | 7 ++ .../tests/auto/headersclean/tst_headersclean.cpp | 79 ++++++++++++++++++++ - qtkernel/tests/auto/host.pro | 1 + + qtbase/tests/auto/host.pro | 1 + qtmultimedia/tests/auto/auto.pro | 2 +- .../tests/auto/headersclean/headersclean.pro | 4 + .../tests/auto/headersclean/tst_headersclean.cpp | 62 +++++++++++++++ @@ -46,8 +46,8 @@ Subject: [PATCH] Add tst_headersclean for each module create mode 100644 qt3support/tests/auto/headersclean/headersclean.pro create mode 100644 qt3support/tests/auto/headersclean/tst_headersclean.cpp copy qtdeclarative/tests/auto/auto.pro => qt3support/tests/auto/host.pro (50%) - create mode 100644 qtkernel/tests/auto/headersclean/headersclean.pro - create mode 100644 qtkernel/tests/auto/headersclean/tst_headersclean.cpp + create mode 100644 qtbase/tests/auto/headersclean/headersclean.pro + create mode 100644 qtbase/tests/auto/headersclean/tst_headersclean.cpp create mode 100644 qtmultimedia/tests/auto/headersclean/headersclean.pro create mode 100644 qtmultimedia/tests/auto/headersclean/tst_headersclean.cpp copy qtdeclarative/tests/auto/auto.pro => qtmultimedia/tests/auto/host.pro (50%) @@ -273,11 +273,11 @@ index f2173f0..5156cd1 100644 - + headersclean \ + -diff --git a/qtkernel/tests/auto/headersclean/headersclean.pro b/qtkernel/tests/auto/headersclean/headersclean.pro +diff --git a/qtbase/tests/auto/headersclean/headersclean.pro b/qtbase/tests/auto/headersclean/headersclean.pro new file mode 100644 index 0000000..d9b6ae3 --- /dev/null -+++ b/qtkernel/tests/auto/headersclean/headersclean.pro ++++ b/qtbase/tests/auto/headersclean/headersclean.pro @@ -0,0 +1,7 @@ +load(qttest_p4) +SOURCES += tst_headersclean.cpp @@ -287,11 +287,11 @@ index 0000000..d9b6ae3 +contains(QT_CONFIG,opengl): QT += opengl +contains(QT_CONFIG,openvg): QT += openvg \ No newline at end of file -diff --git a/qtkernel/tests/auto/headersclean/tst_headersclean.cpp b/qtkernel/tests/auto/headersclean/tst_headersclean.cpp +diff --git a/qtbase/tests/auto/headersclean/tst_headersclean.cpp b/qtbase/tests/auto/headersclean/tst_headersclean.cpp new file mode 100644 index 0000000..fbe68f5 --- /dev/null -+++ b/qtkernel/tests/auto/headersclean/tst_headersclean.cpp ++++ b/qtbase/tests/auto/headersclean/tst_headersclean.cpp @@ -0,0 +1,79 @@ +/**************************************************************************** +** @@ -373,10 +373,10 @@ index 0000000..fbe68f5 +QTEST_MAIN(tst_HeadersClean) +#include "tst_headersclean.moc" \ No newline at end of file -diff --git a/qtkernel/tests/auto/host.pro b/qtkernel/tests/auto/host.pro +diff --git a/qtbase/tests/auto/host.pro b/qtbase/tests/auto/host.pro index 61c7c6a..44216ae 100644 ---- a/qtkernel/tests/auto/host.pro -+++ b/qtkernel/tests/auto/host.pro +--- a/qtbase/tests/auto/host.pro ++++ b/qtbase/tests/auto/host.pro @@ -1,6 +1,7 @@ TEMPLATE=subdirs SUBDIRS=\ diff --git a/patches/0106-Remove-not-needed-.pri-include.patch b/patches/0106-Remove-not-needed-.pri-include.patch index bc45248..5e714d4 100644 --- a/patches/0106-Remove-not-needed-.pri-include.patch +++ b/patches/0106-Remove-not-needed-.pri-include.patch @@ -4,13 +4,13 @@ Date: Fri, 25 Mar 2011 13:31:44 -0500 Subject: [PATCH] Remove not needed .pri include --- - qtkernel/tests/auto/qsidebar/qsidebar.pro | 2 -- + qtbase/tests/auto/qsidebar/qsidebar.pro | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) -diff --git a/qtkernel/tests/auto/qsidebar/qsidebar.pro b/qtkernel/tests/auto/qsidebar/qsidebar.pro +diff --git a/qtbase/tests/auto/qsidebar/qsidebar.pro b/qtbase/tests/auto/qsidebar/qsidebar.pro index b1fba73..91a2137 100644 ---- a/qtkernel/tests/auto/qsidebar/qsidebar.pro -+++ b/qtkernel/tests/auto/qsidebar/qsidebar.pro +--- a/qtbase/tests/auto/qsidebar/qsidebar.pro ++++ b/qtbase/tests/auto/qsidebar/qsidebar.pro @@ -1,7 +1,5 @@ CONFIG += qttest_p4 diff --git a/patches/0107-Only-run-JSC-benchmarks-if-access-to-the-source-code.patch b/patches/0107-Only-run-JSC-benchmarks-if-access-to-the-source-code.patch index 16d7b10..ecbb8d3 100644 --- a/patches/0107-Only-run-JSC-benchmarks-if-access-to-the-source-code.patch +++ b/patches/0107-Only-run-JSC-benchmarks-if-access-to-the-source-code.patch @@ -11,10 +11,10 @@ still compiles in this case. .../benchmarks/corelib/tools/qregexp/qregexp.pro | 7 +++++-- 2 files changed, 13 insertions(+), 6 deletions(-) -diff --git a/qtkernel/tests/benchmarks/corelib/tools/qregexp/main.cpp b/qtkernel/tests/benchmarks/corelib/tools/qregexp/main.cpp +diff --git a/qtbase/tests/benchmarks/corelib/tools/qregexp/main.cpp b/qtbase/tests/benchmarks/corelib/tools/qregexp/main.cpp index 98d539f..74f9e63 100644 ---- a/qtkernel/tests/benchmarks/corelib/tools/qregexp/main.cpp -+++ b/qtkernel/tests/benchmarks/corelib/tools/qregexp/main.cpp +--- a/qtbase/tests/benchmarks/corelib/tools/qregexp/main.cpp ++++ b/qtbase/tests/benchmarks/corelib/tools/qregexp/main.cpp @@ -49,9 +49,10 @@ #include <boost/regex.hpp> #endif @@ -69,10 +69,10 @@ index 98d539f..74f9e63 100644 #ifdef HAVE_BOOST void tst_qregexp::simpleFindBoost(){ -diff --git a/qtkernel/tests/benchmarks/corelib/tools/qregexp/qregexp.pro b/qtkernel/tests/benchmarks/corelib/tools/qregexp/qregexp.pro +diff --git a/qtbase/tests/benchmarks/corelib/tools/qregexp/qregexp.pro b/qtbase/tests/benchmarks/corelib/tools/qregexp/qregexp.pro index ffdad12..5e53824a 100644 ---- a/qtkernel/tests/benchmarks/corelib/tools/qregexp/qregexp.pro -+++ b/qtkernel/tests/benchmarks/corelib/tools/qregexp/qregexp.pro +--- a/qtbase/tests/benchmarks/corelib/tools/qregexp/qregexp.pro ++++ b/qtbase/tests/benchmarks/corelib/tools/qregexp/qregexp.pro @@ -5,14 +5,17 @@ DEPENDPATH += . INCLUDEPATH += . RESOURCES+=qregexp.qrc diff --git a/pulse-build-script b/pulse-build-script index 04e59a6..3d77c34 100755 --- a/pulse-build-script +++ b/pulse-build-script @@ -88,7 +88,7 @@ sub runAutotests { # Please don't change this value, otherwise you will send the results to Testr #$ENV{"PULSE_TESTS_TESTR"} = "0"; - my @autotests = ("phonon", "qt3support", "qtkernel", "qtmultimedia", "qtdeclarative", "qtscript", "qtsvg", "qttools", "qtxmlpatterns"); + my @autotests = ("phonon", "qt3support", "qtbase", "qtmultimedia", "qtdeclarative", "qtscript", "qtsvg", "qttools", "qtxmlpatterns"); chdir($basepath) or die("Could not chdir to qt"); system_v("git clone qtgitreadonly:qa-dungeon/mainline.git $basepath/_qadungeon") and die("Could not clone qa-dungeon"); @@ -134,9 +134,9 @@ if ($Config{'osname'} =~ /mswin/i) { $ENV{"PATH"} .= ";C:\\Python26" if (-d "C:\\Python26"); my $winQtdir = $qtdir; $winQtdir =~ s,/,\\,g; - $ENV{"PATH"} = "$winQtdir\\qt\\qtkernel\\bin;$ENV{PATH}"; + $ENV{"PATH"} = "$winQtdir\\qt\\qtbase\\bin;$ENV{PATH}"; } else { - $ENV{"PATH"} = "$qtdir/qt/qtkernel/bin:$ENV{PATH}"; + $ENV{"PATH"} = "$qtdir/qt/qtbase/bin:$ENV{PATH}"; } if (! -d "$qtdir/.git" && !$clone_qtbundle) { diff --git a/qt-bundle/configure b/qt-bundle/configure index 6419fbd..78835fe 100755 --- a/qt-bundle/configure +++ b/qt-bundle/configure @@ -46,16 +46,16 @@ my $outpath = getcwd(); system_v("perl fix-webkit") and die("Applying webkit patches failed"); -ensureDir("$outpath/qtkernel"); -chdir("$outpath/qtkernel"); -system_v("$relpath/qtkernel/configure @ARGV"); +ensureDir("$outpath/qtbase"); +chdir("$outpath/qtbase"); +system_v("$relpath/qtbase/configure @ARGV"); chdir("$outpath"); open QMAKE_CACHE, ">.qmake.cache" || die "Could not open .qmake.cache for writing!\n"; -print QMAKE_CACHE "include(\$\$PWD/qtkernel/.qmake.cache)\n"; +print QMAKE_CACHE "include(\$\$PWD/qtbase/.qmake.cache)\n"; close QMAKE_CACHE; -system_v("$outpath/qtkernel/bin/qmake $relpath/qt.pro"); +system_v("$outpath/qtbase/bin/qmake $relpath/qt.pro"); exit 0; diff --git a/qt-bundle/patches/qtwebkit/0009-Removed-modular-references-after-support-for-the-fla.patch b/qt-bundle/patches/qtwebkit/0009-Removed-modular-references-after-support-for-the-fla.patch index cc80492..ed50cd6 100644 --- a/qt-bundle/patches/qtwebkit/0009-Removed-modular-references-after-support-for-the-fla.patch +++ b/qt-bundle/patches/qtwebkit/0009-Removed-modular-references-after-support-for-the-fla.patch @@ -9,7 +9,7 @@ information, as demonstrated in the patch by checking QT.phonon.includes. In addition, remove the reference to uitools. It has been moved to -QtKernel now, and therefore is always available. +QtBase now, and therefore is always available. --- Source/WebKit.pri | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/qt-bundle/qt.pro b/qt-bundle/qt.pro index f5f4ac4..415939c 100644 --- a/qt-bundle/qt.pro +++ b/qt-bundle/qt.pro @@ -1,39 +1,39 @@ TEMPLATE = subdirs -module_qtkernel.subdir = $$IN_PWD/qtkernel -module_qtkernel.target = module-qtkernel +module_qtbase.subdir = $$IN_PWD/qtbase +module_qtbase.target = module-qtbase module_qtsvg.subdir = $$IN_PWD/qtsvg module_qtsvg.target = module-qtsvg -module_qtsvg.depends = module_qtkernel +module_qtsvg.depends = module_qtbase module_phonon.subdir = $$IN_PWD/phonon module_phonon.target = module-phonon -module_phonon.depends = module_qtkernel +module_phonon.depends = module_qtbase module_qtmultimedia.subdir = $$IN_PWD/qtmultimedia module_qtmultimedia.target = module-qtmultimedia -module_qtmultimedia.depends = module_qtkernel +module_qtmultimedia.depends = module_qtbase module_qtxmlpatterns.subdir = $$IN_PWD/qtxmlpatterns module_qtxmlpatterns.target = module-qtxmlpatterns -module_qtxmlpatterns.depends = module_qtkernel +module_qtxmlpatterns.depends = module_qtbase module_qtscript.subdir = $$IN_PWD/qtscript module_qtscript.target = module-qtscript -module_qtscript.depends = module_qtkernel +module_qtscript.depends = module_qtbase module_qtdeclarative.subdir = $$IN_PWD/qtdeclarative module_qtdeclarative.target = module-qtdeclarative -module_qtdeclarative.depends = module_qtkernel module_qtscript module_qtsvg module_qtxmlpatterns +module_qtdeclarative.depends = module_qtbase module_qtscript module_qtsvg module_qtxmlpatterns module_qt3support.subdir = $$IN_PWD/qt3support module_qt3support.target = module-qt3support -module_qt3support.depends = module_qtkernel +module_qt3support.depends = module_qtbase module_qtwebkit.file = qtwebkit.pri module_qtwebkit.makefile = Makefile.qtwebkit -module_qtwebkit.depends = module_qtkernel module_qtscript module_qtdeclarative module_phonon +module_qtwebkit.depends = module_qtbase module_qtscript module_qtdeclarative module_phonon # The qtwebkit subdir does not follow the "module-*" scheme, so make our own target that does. module_qtwebkit_target.target = module-qtwebkit module_qtwebkit_target.commands = @@ -46,7 +46,7 @@ qtwebkit_examples_and_demos.depends = module_qtwebkit module_qttools.subdir = $$IN_PWD/qttools module_qttools.target = module-qttools -module_qttools.depends = module_qtkernel module_qtscript module_qtdeclarative module_qt3support module_qtwebkit +module_qttools.depends = module_qtbase module_qtscript module_qtdeclarative module_qt3support module_qtwebkit win32:module_qttools.depends += module_activeqt module_qttranslations.subdir = $$IN_PWD/qttranslations @@ -59,11 +59,11 @@ module_qtdoc.depends = module_qtdeclarative module_qttools #for the demos and Qt module_activeqt.subdir = $$IN_PWD/activeqt module_activeqt.target = module-activeqt -module_activeqt.depends = module_qtkernel +module_activeqt.depends = module_qtbase SUBDIRS = \ - module_qtkernel \ + module_qtbase \ module_qtsvg \ module_phonon \ module_qtxmlpatterns \ diff --git a/scripts/010_qtbase b/scripts/010_qtbase new file mode 100644 index 0000000..920dcf8 --- /dev/null +++ b/scripts/010_qtbase @@ -0,0 +1,98 @@ +#-------------------------------------------------------------------------------------------------- +# Standard modularization template +# -------------------------------- +# +# The script will start execution from <QTDIR>. +# +# Available variables: +# $qtdir = <QTDIR> or where you started the modularize script from +# $basepath = path for the modularize script, and basepath for the modularization repo +# $OStype = <n> where <n> is one of 0 = Windows, 1 = Unix, 2 = Mac +# +# To execute a command: +# run("git mv foo bar") # runs command, reports error possition and dies +# runNotDie("git mv foo bar") # runs command, reports error possition, returns error code +# and continues. Use ($? >> 8) to get the real exit code. +# ensureDir("qtbase") # Ensures that qtbase exists and is a directory. Will create +# it if it does not exist. +#-------------------------------------------------------------------------------------------------- + +ensureDir("qtbase/src/tools"); +run("git mv src/tools/bootstrap qtbase/src/tools/bootstrap"); +run("git mv src/tools/moc qtbase/src/tools/moc"); +run("git mv src/tools/uic qtbase/src/tools/uic"); +run("git mv src/tools/idc qtbase/src/tools/idc"); +run("git mv src/tools/rcc qtbase/src/tools/rcc"); +run("git mv src/tools/tools.pro qtbase/src/tools/tools.pro"); +run("git mv src/corelib qtbase/src/corelib"); +run("git mv src/gui qtbase/src/gui"); +run("git mv src/network qtbase/src/network"); +run("git mv src/opengl qtbase/src/opengl"); +run("git mv src/openvg qtbase/src/openvg"); +run("git mv src/sql qtbase/src/sql"); +run("git mv src/xml qtbase/src/xml"); +run("git mv src/dbus qtbase/src/dbus"); +run("git mv tools/designer/src/uitools qtbase/src"); +ensureDir("qtbase/tools"); +run("git mv tools/designer/src/lib/uilib qtbase/tools/uilib"); + +ensureDir("qtbase/src/plugins/imageformats"); +# all but we want to exclue iconengines, imageformats +my @pluginsDirs = findFiles("src/plugins", "^[abcdgkmpqs].*", 0); +foreach (@pluginsDirs) { + # Will be handled by declarative. + next if (/^qmltooling$/); + run("git mv src/plugins/$_ qtbase/src/plugins"); +} +run("git mv src/plugins/inputmethods qtbase/src/plugins/inputmethods"); +# all but we want to exclue svg +my @imageformatsDirs = findFiles("src/plugins/imageformats", "^[gijmt].*", 0); +foreach (@imageformatsDirs) { + run("git mv src/plugins/imageformats/$_ qtbase/src/plugins/imageformats"); +} + +run("git mv src/s60installs qtbase/src/s60installs"); +run("git mv src/s60main qtbase/src/s60main"); +run("git mv src/winmain qtbase/src/winmain"); +run("git mv src/testlib qtbase/src/testlib"); +ensureDir("qtbase/src/3rdparty"); +# all but we want to exclue webkit, javascriptcore, phonon, clucene +my @thirdpartyDirs = findFiles("src/3rdparty", "^[defhlmMRsxz].*", 0); +foreach (@thirdpartyDirs) { + run("git mv src/3rdparty/$_ qtbase/src/3rdparty"); +} +run("git mv src/3rdparty/wintab qtbase/src/3rdparty/wintab"); +run("git mv src/3rdparty/patches qtbase/src/3rdparty/patches"); +run("git mv src/3rdparty/pixman qtbase/src/3rdparty/pixman"); +run("git mv src/3rdparty/powervr qtbase/src/3rdparty/powervr"); +run("git mv src/3rdparty/ce-compat qtbase/src/3rdparty/ce-compat"); +run("git mv src/3rdparty/ptmalloc qtbase/src/3rdparty/ptmalloc"); +run("git mv src/3rdparty/.gitattributes qtbase/src/3rdparty/"); + +run("git mv src/qbase.pri qtbase/src"); +run("git mv src/qt_install.pri qtbase/src"); +run("git mv src/qt_targets.pri qtbase/src"); +run("git mv src/src.pro qtbase/src"); + +run("git mv configure* qtbase"); +run("git mv header* qtbase"); +run("git mv INSTALL* qtbase"); +run("git mv LGPL_* qtbase"); +run("git mv LICENSE* qtbase"); +run("git mv projects.pro qtbase/qtbase.pro"); +run("git mv config.tests* qtbase"); +run("git mv config.profiles* qtbase"); +run("git mv bin* qtbase"); +run("git mv dist* qtbase"); +run("git mv lib* qtbase"); +run("git mv mkspecs* qtbase"); +run("git mv qmake* qtbase"); + +ensureDir("qtbase/tools/shared"); +run("git mv tools/shared/windows qtbase/tools/shared/windows"); +run("git mv tools/shared/symbian qtbase/tools/shared/symbian"); +run("git mv tools/configure qtbase/tools/configure"); + +run("git rm -rfq templates"); + +return 1; diff --git a/scripts/010_qtkernel b/scripts/010_qtkernel deleted file mode 100644 index ea52461..0000000 --- a/scripts/010_qtkernel +++ /dev/null @@ -1,98 +0,0 @@ -#-------------------------------------------------------------------------------------------------- -# Standard modularization template -# -------------------------------- -# -# The script will start execution from <QTDIR>. -# -# Available variables: -# $qtdir = <QTDIR> or where you started the modularize script from -# $basepath = path for the modularize script, and basepath for the modularization repo -# $OStype = <n> where <n> is one of 0 = Windows, 1 = Unix, 2 = Mac -# -# To execute a command: -# run("git mv foo bar") # runs command, reports error possition and dies -# runNotDie("git mv foo bar") # runs command, reports error possition, returns error code -# and continues. Use ($? >> 8) to get the real exit code. -# ensureDir("qtkernel") # Ensures that qtkernel exists and is a directory. Will create -# it if it does not exist. -#-------------------------------------------------------------------------------------------------- - -ensureDir("qtkernel/src/tools"); -run("git mv src/tools/bootstrap qtkernel/src/tools/bootstrap"); -run("git mv src/tools/moc qtkernel/src/tools/moc"); -run("git mv src/tools/uic qtkernel/src/tools/uic"); -run("git mv src/tools/idc qtkernel/src/tools/idc"); -run("git mv src/tools/rcc qtkernel/src/tools/rcc"); -run("git mv src/tools/tools.pro qtkernel/src/tools/tools.pro"); -run("git mv src/corelib qtkernel/src/corelib"); -run("git mv src/gui qtkernel/src/gui"); -run("git mv src/network qtkernel/src/network"); -run("git mv src/opengl qtkernel/src/opengl"); -run("git mv src/openvg qtkernel/src/openvg"); -run("git mv src/sql qtkernel/src/sql"); -run("git mv src/xml qtkernel/src/xml"); -run("git mv src/dbus qtkernel/src/dbus"); -run("git mv tools/designer/src/uitools qtkernel/src"); -ensureDir("qtkernel/tools"); -run("git mv tools/designer/src/lib/uilib qtkernel/tools/uilib"); - -ensureDir("qtkernel/src/plugins/imageformats"); -# all but we want to exclue iconengines, imageformats -my @pluginsDirs = findFiles("src/plugins", "^[abcdgkmpqs].*", 0); -foreach (@pluginsDirs) { - # Will be handled by declarative. - next if (/^qmltooling$/); - run("git mv src/plugins/$_ qtkernel/src/plugins"); -} -run("git mv src/plugins/inputmethods qtkernel/src/plugins/inputmethods"); -# all but we want to exclue svg -my @imageformatsDirs = findFiles("src/plugins/imageformats", "^[gijmt].*", 0); -foreach (@imageformatsDirs) { - run("git mv src/plugins/imageformats/$_ qtkernel/src/plugins/imageformats"); -} - -run("git mv src/s60installs qtkernel/src/s60installs"); -run("git mv src/s60main qtkernel/src/s60main"); -run("git mv src/winmain qtkernel/src/winmain"); -run("git mv src/testlib qtkernel/src/testlib"); -ensureDir("qtkernel/src/3rdparty"); -# all but we want to exclue webkit, javascriptcore, phonon, clucene -my @thirdpartyDirs = findFiles("src/3rdparty", "^[defhlmMRsxz].*", 0); -foreach (@thirdpartyDirs) { - run("git mv src/3rdparty/$_ qtkernel/src/3rdparty"); -} -run("git mv src/3rdparty/wintab qtkernel/src/3rdparty/wintab"); -run("git mv src/3rdparty/patches qtkernel/src/3rdparty/patches"); -run("git mv src/3rdparty/pixman qtkernel/src/3rdparty/pixman"); -run("git mv src/3rdparty/powervr qtkernel/src/3rdparty/powervr"); -run("git mv src/3rdparty/ce-compat qtkernel/src/3rdparty/ce-compat"); -run("git mv src/3rdparty/ptmalloc qtkernel/src/3rdparty/ptmalloc"); -run("git mv src/3rdparty/.gitattributes qtkernel/src/3rdparty/"); - -run("git mv src/qbase.pri qtkernel/src"); -run("git mv src/qt_install.pri qtkernel/src"); -run("git mv src/qt_targets.pri qtkernel/src"); -run("git mv src/src.pro qtkernel/src"); - -run("git mv configure* qtkernel"); -run("git mv header* qtkernel"); -run("git mv INSTALL* qtkernel"); -run("git mv LGPL_* qtkernel"); -run("git mv LICENSE* qtkernel"); -run("git mv projects.pro qtkernel/qtkernel.pro"); -run("git mv config.tests* qtkernel"); -run("git mv config.profiles* qtkernel"); -run("git mv bin* qtkernel"); -run("git mv dist* qtkernel"); -run("git mv lib* qtkernel"); -run("git mv mkspecs* qtkernel"); -run("git mv qmake* qtkernel"); - -ensureDir("qtkernel/tools/shared"); -run("git mv tools/shared/windows qtkernel/tools/shared/windows"); -run("git mv tools/shared/symbian qtkernel/tools/shared/symbian"); -run("git mv tools/configure qtkernel/tools/configure"); - -run("git rm -rfq templates"); - -return 1; diff --git a/scripts/025_qtsvg b/scripts/025_qtsvg index 98243ae..4bffe2f 100644 --- a/scripts/025_qtsvg +++ b/scripts/025_qtsvg @@ -13,7 +13,7 @@ # run("git mv foo bar") # runs command, reports error possition and dies # runNotDie("git mv foo bar") # runs command, reports error possition, returns error code # and continues. Use ($? >> 8) to get the real exit code. -# ensureDir("qtkernel") # Ensures that qtkernel exists and is a directory. Will create +# ensureDir("qtbase") # Ensures that qtbase exists and is a directory. Will create # it if it does not exist. #-------------------------------------------------------------------------------------------------- diff --git a/scripts/030_qtwebkit b/scripts/030_qtwebkit index c0641db..4308be8 100644 --- a/scripts/030_qtwebkit +++ b/scripts/030_qtwebkit @@ -13,7 +13,7 @@ # run("git mv foo bar") # runs command, reports error possition and dies # runNotDie("git mv foo bar") # runs command, reports error possition, returns error code # and continues. Use ($? >> 8) to get the real exit code. -# ensureDir("qtkernel") # Ensures that qtkernel exists and is a directory. Will create +# ensureDir("qtbase") # Ensures that qtbase exists and is a directory. Will create # it if it does not exist. #-------------------------------------------------------------------------------------------------- diff --git a/scripts/040_declarative b/scripts/040_declarative index 8d103d2..ad7c948 100644 --- a/scripts/040_declarative +++ b/scripts/040_declarative @@ -13,7 +13,7 @@ # run("git mv foo bar") # runs command, reports error possition and dies # runNotDie("git mv foo bar") # runs command, reports error possition, returns error code # and continues. Use ($? >> 8) to get the real exit code. -# ensureDir("qtkernel") # Ensures that qtkernel exists and is a directory. Will create +# ensureDir("qtbase") # Ensures that qtbase exists and is a directory. Will create # it if it does not exist. #-------------------------------------------------------------------------------------------------- diff --git a/scripts/050_script b/scripts/050_script index 2103492..bd4aa0d 100644 --- a/scripts/050_script +++ b/scripts/050_script @@ -13,7 +13,7 @@ # run("git mv foo bar") # runs command, reports error possition and dies # runNotDie("git mv foo bar") # runs command, reports error possition, returns error code # and continues. Use ($? >> 8) to get the real exit code. -# ensureDir("qtkernel") # Ensures that qtkernel exists and is a directory. Will create +# ensureDir("qtbase") # Ensures that qtbase exists and is a directory. Will create # it if it does not exist. #-------------------------------------------------------------------------------------------------- @@ -21,7 +21,7 @@ ensureDir("qtscript/src/plugins"); ensureDir("qtscript/tools"); run("git mv src/script qtscript/src/script"); run("git mv src/scripttools qtscript/src/scripttools"); -run("git mv qtkernel/src/plugins/script qtscript/src/plugins/script"); +run("git mv qtbase/src/plugins/script qtscript/src/plugins/script"); ensureDir("qtscript/src/3rdparty"); run("git mv src/3rdparty/javascriptcore qtscript/src/3rdparty/javascriptcore"); diff --git a/scripts/080_activeqt b/scripts/080_activeqt index 1bd227e..9e2e269 100644 --- a/scripts/080_activeqt +++ b/scripts/080_activeqt @@ -13,7 +13,7 @@ # run("git mv foo bar") # runs command, reports error possition and dies # runNotDie("git mv foo bar") # runs command, reports error possition, returns error code # and continues. Use ($? >> 8) to get the real exit code. -# ensureDir("qtkernel") # Ensures that qtkernel exists and is a directory. Will create +# ensureDir("qtbase") # Ensures that qtbase exists and is a directory. Will create # it if it does not exist. #-------------------------------------------------------------------------------------------------- diff --git a/scripts/100_qt3support b/scripts/100_qt3support index 6920640..6ea79c0 100644 --- a/scripts/100_qt3support +++ b/scripts/100_qt3support @@ -13,7 +13,7 @@ # run("git mv foo bar") # runs command, reports error possition and dies # runNotDie("git mv foo bar") # runs command, reports error possition, returns error code # and continues. Use ($? >> 8) to get the real exit code. -# ensureDir("qtkernel") # Ensures that qtkernel exists and is a directory. Will create +# ensureDir("qtbase") # Ensures that qtbase exists and is a directory. Will create # it if it does not exist. #-------------------------------------------------------------------------------------------------- @@ -21,7 +21,7 @@ ensureDir("qt3support/src/tools"); ensureDir("qt3support/src/plugins"); ensureDir("qt3support/tools"); run("git mv src/qt3support qt3support/src/qt3support"); -run("git mv qtkernel/src/plugins/accessible/compat qt3support/src/plugins/accessible"); +run("git mv qtbase/src/plugins/accessible/compat qt3support/src/plugins/accessible"); run("git mv src/tools/uic3 qt3support/src/tools/uic3"); run("git mv tools/porting qt3support/tools/"); diff --git a/scripts/110_phonon b/scripts/110_phonon index c098638..0f9f9c4 100644 --- a/scripts/110_phonon +++ b/scripts/110_phonon @@ -13,13 +13,13 @@ # run("git mv foo bar") # runs command, reports error possition and dies # runNotDie("git mv foo bar") # runs command, reports error possition, returns error code # and continues. Use ($? >> 8) to get the real exit code. -# ensureDir("qtkernel") # Ensures that qtkernel exists and is a directory. Will create +# ensureDir("qtbase") # Ensures that qtbase exists and is a directory. Will create # it if it does not exist. #-------------------------------------------------------------------------------------------------- ensureDir("phonon/src/plugins"); run("git mv src/phonon phonon/src/phonon"); -run("git mv qtkernel/src/plugins/phonon phonon/src/plugins/phonon"); +run("git mv qtbase/src/plugins/phonon phonon/src/plugins/phonon"); ensureDir("phonon/src/3rdparty"); run("git mv src/3rdparty/phonon phonon/src/3rdparty"); diff --git a/scripts/120_qtmultimedia b/scripts/120_qtmultimedia index c55e7f2..8b6ee71 100644 --- a/scripts/120_qtmultimedia +++ b/scripts/120_qtmultimedia @@ -13,7 +13,7 @@ # run("git mv foo bar") # runs command, reports error possition and dies # runNotDie("git mv foo bar") # runs command, reports error possition, returns error code # and continues. Use ($? >> 8) to get the real exit code. -# ensureDir("qtkernel") # Ensures that qtkernel exists and is a directory. Will create +# ensureDir("qtbase") # Ensures that qtbase exists and is a directory. Will create # it if it does not exist. #-------------------------------------------------------------------------------------------------- diff --git a/scripts/130_xml b/scripts/130_xml index e8945be..af5ba93 100644 --- a/scripts/130_xml +++ b/scripts/130_xml @@ -13,7 +13,7 @@ # run("git mv foo bar") # runs command, reports error possition and dies # runNotDie("git mv foo bar") # runs command, reports error possition, returns error code # and continues. Use ($? >> 8) to get the real exit code. -# ensureDir("qtkernel") # Ensures that qtkernel exists and is a directory. Will create +# ensureDir("qtbase") # Ensures that qtbase exists and is a directory. Will create # it if it does not exist. #-------------------------------------------------------------------------------------------------- diff --git a/scripts/140_qttools b/scripts/140_qttools index 0a43138..253967a 100644 --- a/scripts/140_qttools +++ b/scripts/140_qttools @@ -13,7 +13,7 @@ # run("git mv foo bar") # runs command, reports error possition and dies # runNotDie("git mv foo bar") # runs command, reports error possition, returns error code # and continues. Use ($? >> 8) to get the real exit code. -# ensureDir("qtkernel") # Ensures that qtkernel exists and is a directory. Will create +# ensureDir("qtbase") # Ensures that qtbase exists and is a directory. Will create # it if it does not exist. #-------------------------------------------------------------------------------------------------- diff --git a/scripts/150_translations b/scripts/150_translations index 23822d8..aa23ef1 100644 --- a/scripts/150_translations +++ b/scripts/150_translations @@ -13,7 +13,7 @@ # run("git mv foo bar") # runs command, reports error possition and dies # runNotDie("git mv foo bar") # runs command, reports error possition, returns error code # and continues. Use ($? >> 8) to get the real exit code. -# ensureDir("qtkernel") # Ensures that qtkernel exists and is a directory. Will create +# ensureDir("qtbase") # Ensures that qtbase exists and is a directory. Will create # it if it does not exist. #-------------------------------------------------------------------------------------------------- diff --git a/scripts/200_examples b/scripts/200_examples index 1736472..1807e6a 100644 --- a/scripts/200_examples +++ b/scripts/200_examples @@ -13,7 +13,7 @@ # run("git mv foo bar") # runs command, reports error possition and dies # runNotDie("git mv foo bar") # runs command, reports error possition, returns error code # and continues. Use ($? >> 8) to get the real exit code. -# ensureDir("qtkernel") # Ensures that qtkernel exists and is a directory. Will create +# ensureDir("qtbase") # Ensures that qtbase exists and is a directory. Will create # it if it does not exist. #-------------------------------------------------------------------------------------------------- @@ -42,16 +42,16 @@ ensureDir("qt3support/examples/graphicsview"); run("git mv examples/graphicsview/portedcanvas qt3support/examples/graphicsview"); run("git mv examples/graphicsview/portedasteroids qt3support/examples/graphicsview"); -ensureDir("qtkernel/examples"); -run("git mv examples/qmake qtkernel/examples"); -run("git mv examples/graphicsview qtkernel/examples"); -run("git mv examples/ja_JP qtkernel/examples"); -run("git mv examples/symbianpkgrules.pri qtkernel/examples"); -run("git mv examples/richtext qtkernel/examples"); -run("git mv examples/draganddrop qtkernel/examples"); -run("git mv examples/painting qtkernel/examples"); -run("git mv examples/desktop qtkernel/examples"); -run("git mv examples/opengl qtkernel/examples"); +ensureDir("qtbase/examples"); +run("git mv examples/qmake qtbase/examples"); +run("git mv examples/graphicsview qtbase/examples"); +run("git mv examples/ja_JP qtbase/examples"); +run("git mv examples/symbianpkgrules.pri qtbase/examples"); +run("git mv examples/richtext qtbase/examples"); +run("git mv examples/draganddrop qtbase/examples"); +run("git mv examples/painting qtbase/examples"); +run("git mv examples/desktop qtbase/examples"); +run("git mv examples/opengl qtbase/examples"); ensureDir("qttools/examples"); run("git mv examples/designer qttools/examples"); @@ -59,14 +59,14 @@ run("git mv examples/help qttools/examples"); createSubdirProfile("qttools/examples"); if ($isMaster) { - ensureDir("qtkernel/examples/scroller"); - run("git mv examples/scroller/graphicsview qtkernel/examples/scroller/graphicsview"); + ensureDir("qtbase/examples/scroller"); + run("git mv examples/scroller/graphicsview qtbase/examples/scroller/graphicsview"); ensureDir("qtwebkit-examples-and-demos/examples/scroller"); run("git mv examples/scroller/plot qtwebkit-examples-and-demos/examples/scroller/plot"); run("git mv examples/scroller/wheel qtwebkit-examples-and-demos/examples/scroller/wheel"); run("git rm -q examples/scroller/scroller.pro"); createSubdirProfile("qtwebkit-examples-and-demos/examples/scroller"); - createSubdirProfile("qtkernel/examples/scroller"); + createSubdirProfile("qtbase/examples/scroller"); } ensureDir("qtscript/examples"); @@ -113,10 +113,10 @@ foreach (@examples) { } } -run("git mv examples/examples.pro qtkernel/examples/"); -run("git mv examples/README qtkernel/examples/"); -run("git mv examples/tutorials/tutorials.pro qtkernel/examples/tutorials/"); -run("git mv examples/tutorials/README qtkernel/examples/tutorials"); +run("git mv examples/examples.pro qtbase/examples/"); +run("git mv examples/README qtbase/examples/"); +run("git mv examples/tutorials/tutorials.pro qtbase/examples/tutorials/"); +run("git mv examples/tutorials/README qtbase/examples/tutorials"); #everything must have been moved fsRmdirWithParents("examples/tutorials/gettingStarted"); diff --git a/scripts/220_demos b/scripts/220_demos index 065cff3..c3096f9 100644 --- a/scripts/220_demos +++ b/scripts/220_demos @@ -13,7 +13,7 @@ # run("git mv foo bar") # runs command, reports error possition and dies # runNotDie("git mv foo bar") # runs command, reports error possition, returns error code # and continues. Use ($? >> 8) to get the real exit code. -# ensureDir("qtkernel") # Ensures that qtkernel exists and is a directory. Will create +# ensureDir("qtbase") # Ensures that qtbase exists and is a directory. Will create # it if it does not exist. #-------------------------------------------------------------------------------------------------- @@ -30,8 +30,8 @@ run("git mv demos/declarative qtdeclarative/demos"); ensureDir("qtmultimedia/demos"); run("git mv demos/spectrum qtmultimedia/demos"); -ensureDir("qtkernel/demos"); -run("git mv demos/symbianpkgrules.pri qtkernel/demos"); +ensureDir("qtbase/demos"); +run("git mv demos/symbianpkgrules.pri qtbase/demos"); ensureDir("qtdoc/demos"); run("git mv demos/qtdemo qtdoc/demos/"); @@ -61,9 +61,9 @@ foreach (@demos) { } } -run("git mv demos/README qtkernel/demos/"); -run("git mv demos/demos.pro qtkernel/demos/"); -run("git mv demos/embedded/embedded.pro qtkernel/demos/embedded"); +run("git mv demos/README qtbase/demos/"); +run("git mv demos/demos.pro qtbase/demos/"); +run("git mv demos/embedded/embedded.pro qtbase/demos/embedded"); # Everything must have been moved fsRm("demos/.gitignore"); diff --git a/scripts/250_docs b/scripts/250_docs index f29af8f..65f1e30 100644 --- a/scripts/250_docs +++ b/scripts/250_docs @@ -13,12 +13,12 @@ # run("git mv foo bar") # runs command, reports error possition and dies # runNotDie("git mv foo bar") # runs command, reports error possition, returns error code # and continues. Use ($? >> 8) to get the real exit code. -# ensureDir("qtkernel") # Ensures that qtkernel exists and is a directory. Will create +# ensureDir("qtbase") # Ensures that qtbase exists and is a directory. Will create # it if it does not exist. #-------------------------------------------------------------------------------------------------- ensureDir("qtdeclarative/doc/src"); -ensureDir("qtkernel/doc/src"); +ensureDir("qtbase/doc/src"); ensureDir("activeqt/doc/src"); ensureDir("qtscript/doc/src"); ensureDir("qt3support/doc/src"); @@ -27,20 +27,20 @@ ensureDir("qtxmlpatterns/doc/src/snippets"); run("git mv doc/src/declarative qtdeclarative/doc/src/"); -run("git mv doc/src/files-and-resources qtkernel/doc/src/"); +run("git mv doc/src/files-and-resources qtbase/doc/src/"); run("git mv doc/src/frameworks-technologies/activeqt* activeqt/doc/src/"); -# run("git mv doc/src/frameworks-technologies qtkernel/doc/src/"); -# run("git mv doc/src/internationalization qtkernel/doc/src/"); -run("git mv doc/src/network-programming qtkernel/doc/src/"); -run("git mv doc/src/objectmodel qtkernel/doc/src/"); -run("git mv doc/src/painting-and-printing qtkernel/doc/src/"); +# run("git mv doc/src/frameworks-technologies qtbase/doc/src/"); +# run("git mv doc/src/internationalization qtbase/doc/src/"); +run("git mv doc/src/network-programming qtbase/doc/src/"); +run("git mv doc/src/objectmodel qtbase/doc/src/"); +run("git mv doc/src/painting-and-printing qtbase/doc/src/"); run("git mv doc/src/porting qt3support/doc/src/"); run("git mv doc/src/scripting qtscript/doc/src/"); -run("git mv doc/src/widgets-and-layouts qtkernel/doc/src/"); -run("git mv doc/src/windows-and-dialogs qtkernel/doc/src/"); +run("git mv doc/src/widgets-and-layouts qtbase/doc/src/"); +run("git mv doc/src/windows-and-dialogs qtbase/doc/src/"); run("git mv doc/src/xml-processing qtxmlpatterns/doc/src/"); -run("git mv doc/src/sql-programming qtkernel/doc/src/"); -run("git mv doc/src/tutorials qtkernel/doc/src/"); +run("git mv doc/src/sql-programming qtbase/doc/src/"); +run("git mv doc/src/tutorials qtbase/doc/src/"); run("git mv doc/src/snippets/patternist qtxmlpatterns/doc/src/snippets/"); #TODO: to be completed @@ -117,7 +117,7 @@ sub processModule { } } -processModule("qtkernel"); +processModule("qtbase"); processModule("qtsvg"); processModule("qtxmlpatterns"); processModule("qtscript"); diff --git a/scripts/300_autotests b/scripts/300_autotests index 67a5740..576d174 100644 --- a/scripts/300_autotests +++ b/scripts/300_autotests @@ -13,7 +13,7 @@ # run("git mv foo bar") # runs command, reports error possition and dies # runNotDie("git mv foo bar") # runs command, reports error possition, returns error code # and continues. Use ($? >> 8) to get the real exit code. -# ensureDir("qtkernel") # Ensures that qtkernel exists and is a directory. Will create +# ensureDir("qtbase") # Ensures that qtbase exists and is a directory. Will create # it if it does not exist. #-------------------------------------------------------------------------------------------------- @@ -24,7 +24,7 @@ use File::Basename; my $debugScript = 0; # Move the data files of bic from global to modules -our @bicRepos = ('qtkernel' , 'qtsvg', 'qtdeclarative', 'qt3support', 'qtscript', 'phonon', 'qtmultimedia', 'qttools', 'qtxmlpatterns'); +our @bicRepos = ('qtbase' , 'qtsvg', 'qtdeclarative', 'qt3support', 'qtscript', 'phonon', 'qtmultimedia', 'qttools', 'qtxmlpatterns'); foreach (@bicRepos) { my $module = $_; ensureDir("$module/tests/auto/bic/data"); @@ -37,14 +37,14 @@ foreach (@bicRepos) { run("git mv tests/auto/bic/data/QtXmlPatterns* qtxmlpatterns/tests/auto/bic/data"); -run("git mv tests/auto/bic/data/QtCore* qtkernel/tests/auto/bic/data"); -run("git mv tests/auto/bic/data/QtGui* qtkernel/tests/auto/bic/data"); -run("git mv tests/auto/bic/data/QtOpenGL* qtkernel/tests/auto/bic/data"); -run("git mv tests/auto/bic/data/QtNetwork* qtkernel/tests/auto/bic/data"); -run("git mv tests/auto/bic/data/QtSql* qtkernel/tests/auto/bic/data"); -run("git mv tests/auto/bic/data/QtXml* qtkernel/tests/auto/bic/data"); -run("git mv tests/auto/bic/data/QtTest* qtkernel/tests/auto/bic/data"); -run("git mv tests/auto/bic/data/QtDBus* qtkernel/tests/auto/bic/data"); +run("git mv tests/auto/bic/data/QtCore* qtbase/tests/auto/bic/data"); +run("git mv tests/auto/bic/data/QtGui* qtbase/tests/auto/bic/data"); +run("git mv tests/auto/bic/data/QtOpenGL* qtbase/tests/auto/bic/data"); +run("git mv tests/auto/bic/data/QtNetwork* qtbase/tests/auto/bic/data"); +run("git mv tests/auto/bic/data/QtSql* qtbase/tests/auto/bic/data"); +run("git mv tests/auto/bic/data/QtXml* qtbase/tests/auto/bic/data"); +run("git mv tests/auto/bic/data/QtTest* qtbase/tests/auto/bic/data"); +run("git mv tests/auto/bic/data/QtDBus* qtbase/tests/auto/bic/data"); run("git mv tests/auto/bic/data/QtSvg* qtsvg/tests/auto/bic/data"); @@ -122,15 +122,15 @@ sub processProfile { #process each .pro file -processProfile("corelib.pro", "qtkernel"); -processProfile("gui.pro", "qtkernel"); -processProfile("network.pro", "qtkernel"); -processProfile("sql.pro", "qtkernel"); -processProfile("xml.pro", "qtkernel"); -processProfile("other.pro", "qtkernel"); -processProfile("host.pro", "qtkernel"); -processProfile("opengl.pro", "qtkernel"); -processProfile("dbus.pro", "qtkernel"); +processProfile("corelib.pro", "qtbase"); +processProfile("gui.pro", "qtbase"); +processProfile("network.pro", "qtbase"); +processProfile("sql.pro", "qtbase"); +processProfile("xml.pro", "qtbase"); +processProfile("other.pro", "qtbase"); +processProfile("host.pro", "qtbase"); +processProfile("opengl.pro", "qtbase"); +processProfile("dbus.pro", "qtbase"); processProfile("qt3support.pro", "qt3support"); processProfile("xmlpatterns.pro", "qtxmlpatterns"); processProfile("script.pro", "qtscript"); @@ -145,8 +145,8 @@ run("git mv tests/auto/declarative qtdeclarative/tests/auto/"); run("git mv tests/auto/declarative.pro qtdeclarative/tests/auto/auto.pro"); #they are in other.pro, but on the same line -run("git mv tests/auto/qzip qtkernel/tests/auto/"); -run("git mv tests/auto/qtextodfwriter qtkernel/tests/auto/"); +run("git mv tests/auto/qzip qtbase/tests/auto/"); +run("git mv tests/auto/qtextodfwriter qtbase/tests/auto/"); run("git mv tests/auto/uic3 qt3support/tests/auto/"); @@ -157,43 +157,43 @@ ensureDir("qtscript/tests/benchmarks"); run("git mv tests/benchmarks/declarative qtdeclarative/tests/benchmarks"); run("git mv tests/benchmarks/svg qtsvg/tests/benchmarks"); run("git mv tests/benchmarks/script qtscript/tests/benchmarks"); -run("git mv tests/benchmarks qtkernel/tests/"); +run("git mv tests/benchmarks qtbase/tests/"); #shared -run("git mv tests/shared qtkernel/tests"); -run("git mv tests/auto/*.h qtkernel/tests/auto"); +run("git mv tests/shared qtbase/tests"); +run("git mv tests/auto/*.h qtbase/tests/auto"); ensureDir("qtdeclarative/tests/shared"); -fsCopy("qtkernel/tests/shared/util.h", "qtdeclarative/tests/shared/"); +fsCopy("qtbase/tests/shared/util.h", "qtdeclarative/tests/shared/"); ensureDir("qt3support/tests/shared"); -fsCopy("qtkernel/tests/shared/util.h", "qt3support/tests/shared/"); +fsCopy("qtbase/tests/shared/util.h", "qt3support/tests/shared/"); ensureDir("qtscript/tests/shared"); -fsCopy("qtkernel/tests/shared/util.h", "qtscript/tests/shared/"); +fsCopy("qtbase/tests/shared/util.h", "qtscript/tests/shared/"); run("git add qtdeclarative/tests/shared/util.h qt3support/tests/shared/util.h qtscript/tests/shared/util.h"); -fsCopy("qtkernel/tests/auto/network-settings.h", "qt3support/tests/auto/"); -fsCopy("qtkernel/tests/auto/network-settings.h", "qtxmlpatterns/tests/auto/"); +fsCopy("qtbase/tests/auto/network-settings.h", "qt3support/tests/auto/"); +fsCopy("qtbase/tests/auto/network-settings.h", "qtxmlpatterns/tests/auto/"); run("git add qt3support/tests/auto/network-settings.h qtxmlpatterns/tests/auto/network-settings.h"); # There is patch corresponding to this which changes the include path -fsCopy("qt3support/src/qt3support/tools/q3tl.h", "qtkernel/tests/auto/qalgorithms/"); -run("git add qtkernel/tests/auto/qalgorithms/q3tl.h"); +fsCopy("qt3support/src/qt3support/tools/q3tl.h", "qtbase/tests/auto/qalgorithms/"); +run("git add qtbase/tests/auto/qalgorithms/q3tl.h"); #residues run("git mv tests/auto/xmlpatterns.pri qtxmlpatterns/tests/auto/"); -run("git mv tests/auto/solutions.pri qtkernel/tests/auto/"); -run("git mv tests/auto/qtextbrowser.html qtkernel/tests/auto/"); -run("git mv tests/auto/test.pl qtkernel/tests/auto/"); #i don't know if it belongs there. -run("git mv tests/auto/qsslsocket_onDemandCertificates_member qtkernel/tests/auto/"); -run("git mv tests/auto/qsslsocket_onDemandCertificates_static qtkernel/tests/auto/"); +run("git mv tests/auto/solutions.pri qtbase/tests/auto/"); +run("git mv tests/auto/qtextbrowser.html qtbase/tests/auto/"); +run("git mv tests/auto/test.pl qtbase/tests/auto/"); #i don't know if it belongs there. +run("git mv tests/auto/qsslsocket_onDemandCertificates_member qtbase/tests/auto/"); +run("git mv tests/auto/qsslsocket_onDemandCertificates_static qtbase/tests/auto/"); -run("git mv tests/arthur qtkernel/tests/"); +run("git mv tests/arthur qtbase/tests/"); #profiles -run("git mv tests/auto/auto.pro qtkernel/tests/auto/"); +run("git mv tests/auto/auto.pro qtbase/tests/auto/"); run("git mv qtmultimedia/tests/auto/multimedia.pro qtmultimedia/tests/auto/auto.pro"); run("git mv qtscript/tests/auto/script.pro qtscript/tests/auto/auto.pro"); run("git mv qtsvg/tests/auto/svg.pro qtsvg/tests/auto/auto.pro"); @@ -203,7 +203,7 @@ run("git mv qttools/tests/auto/help.pro qttools/tests/auto/auto.pro"); run("echo !cross_compile:SUBDIRS += uic3 >> qt3support/tests/auto/auto.pro"); run("echo SUBDIRS += linguist >> qttools/tests/auto/auto.pro"); -run("git mv tests/tests.pro qtkernel/tests/"); +run("git mv tests/tests.pro qtbase/tests/"); createSubdirProfile("qtdeclarative/tests"); createSubdirProfile("qt3support/tests"); createSubdirProfile("qtsvg/tests"); @@ -216,8 +216,8 @@ createSubdirProfile("qtqa/tests/auto"); createSubdirProfile("qtqa/tests"); createSubdirProfile("qtqa"); -# Move manual tests, they all depend only on qtkernel -run("git mv tests/manual qtkernel/tests/manual/"); +# Move manual tests, they all depend only on qtbase +run("git mv tests/manual qtbase/tests/manual/"); # Add the test directory's README to every module with a test directory foreach (@repos) { diff --git a/scripts/400_util b/scripts/400_util index 0513f2f..8dce423 100644 --- a/scripts/400_util +++ b/scripts/400_util @@ -13,34 +13,34 @@ # run("git mv foo bar") # runs command, reports error possition and dies # runNotDie("git mv foo bar") # runs command, reports error possition, returns error code # and continues. Use ($? >> 8) to get the real exit code. -# ensureDir("qtkernel") # Ensures that qtkernel exists and is a directory. Will create +# ensureDir("qtbase") # Ensures that qtbase exists and is a directory. Will create # it if it does not exist. #-------------------------------------------------------------------------------------------------- -ensureDir("qtkernel/util"); +ensureDir("qtbase/util"); -# harfbuzz is in qtkernel, and its relative location has not even moved -run("git mv util/harfbuzz qtkernel/util/"); +# harfbuzz is in qtbase, and its relative location has not even moved +run("git mv util/harfbuzz qtbase/util/"); # Some code generator -run("git mv util/unicode qtkernel/util/"); -run("git mv util/local_database qtkernel/util/"); -run("git mv util/lexgen qtkernel/util/"); # generates the cssparser -run("git mv util/xkbdatagen qtkernel/util/"); # generates qkeymapper_x11_p.cpp -run("git mv util/network qtkernel/util/"); # generates content for qtkernel/src/network/access/qnetworkcookiejartlds_p.h -run("git mv util/integrity qtkernel/util/"); # used for Qt on Integrity -run("git mv util/plugintest qtkernel/util/"); # reports error string for failed plugin loading +run("git mv util/unicode qtbase/util/"); +run("git mv util/local_database qtbase/util/"); +run("git mv util/lexgen qtbase/util/"); # generates the cssparser +run("git mv util/xkbdatagen qtbase/util/"); # generates qkeymapper_x11_p.cpp +run("git mv util/network qtbase/util/"); # generates content for qtbase/src/network/access/qnetworkcookiejartlds_p.h +run("git mv util/integrity qtbase/util/"); # used for Qt on Integrity +run("git mv util/plugintest qtbase/util/"); # reports error string for failed plugin loading #i know s60theme requires webkit, but it belongs there i think -run("git mv util/s60theme qtkernel/util/"); -run("git mv util/s60pixelmetrics qtkernel/util/"); +run("git mv util/s60theme qtbase/util/"); +run("git mv util/s60pixelmetrics qtbase/util/"); -# scripts/make_qfeatures_dot_h belongs into qtkernel +# scripts/make_qfeatures_dot_h belongs into qtbase # scripts/unix_to_dos not really, but i'm lazy -run("git mv util/scripts qtkernel/util/"); +run("git mv util/scripts qtbase/util/"); ensureDir("qtscript/util"); @@ -55,7 +55,7 @@ run("git mv util/normalize devtools/util/"); # qlalr -# this tools is used to generate QXmlStreamReader parser, in qt kernel, +# this tools is used to generate QXmlStreamReader parser, in qt base, # QMLJS parser in both declarative module and qt creator, # the old qtscript classing parser, and some third party parser such as qjsonparser ensureDir("qlalr"); diff --git a/scripts/880_symbianpkgrules b/scripts/880_symbianpkgrules index 64d9ce8..862c6f7 100644 --- a/scripts/880_symbianpkgrules +++ b/scripts/880_symbianpkgrules @@ -13,7 +13,7 @@ # run("git mv foo bar") # runs command, reports error possition and dies # runNotDie("git mv foo bar") # runs command, reports error possition, returns error code # and continues. Use ($? >> 8) to get the real exit code. -# ensureDir("qtkernel") # Ensures that qtkernel exists and is a directory. Will create +# ensureDir("qtbase") # Ensures that qtbase exists and is a directory. Will create # it if it does not exist. #-------------------------------------------------------------------------------------------------- @@ -42,7 +42,7 @@ foreach my $repo (@repos) { } foreach my $profile (@demosAndExamples) { - next if ($profile eq "qtkernel/config.profiles"); + next if ($profile eq "qtbase/config.profiles"); fixSymbianPkgFile($profile); } diff --git a/scripts/900_gitignore b/scripts/900_gitignore index 941cf24..11129e2 100644 --- a/scripts/900_gitignore +++ b/scripts/900_gitignore @@ -13,7 +13,7 @@ # run("git mv foo bar") # runs command, reports error possition and dies # runNotDie("git mv foo bar") # runs command, reports error possition, returns error code # and continues. Use ($? >> 8) to get the real exit code. -# ensureDir("qtkernel") # Ensures that qtkernel exists and is a directory. Will create +# ensureDir("qtbase") # Ensures that qtbase exists and is a directory. Will create # it if it does not exist. #-------------------------------------------------------------------------------------------------- diff --git a/scripts/905_git_split b/scripts/905_git_split index fba3986..59f8b4e 100644 --- a/scripts/905_git_split +++ b/scripts/905_git_split @@ -13,7 +13,7 @@ # run("git mv foo bar") # runs command, reports error possition and dies # runNotDie("git mv foo bar") # runs command, reports error possition, returns error code # and continues. Use ($? >> 8) to get the real exit code. -# ensureDir("qtkernel") # Ensures that qtkernel exists and is a directory. Will create +# ensureDir("qtbase") # Ensures that qtbase exists and is a directory. Will create # it if it does not exist. #-------------------------------------------------------------------------------------------------- diff --git a/scripts/950_pulse_dep_tree b/scripts/950_pulse_dep_tree index f2a2c79..ff74fc6 100644 --- a/scripts/950_pulse_dep_tree +++ b/scripts/950_pulse_dep_tree @@ -13,23 +13,23 @@ # run("git mv foo bar") # runs command, reports error possition and dies # runNotDie("git mv foo bar") # runs command, reports error possition, returns error code # and continues. Use ($? >> 8) to get the real exit code. -# ensureDir("qtkernel") # Ensures that qtkernel exists and is a directory. Will create +# ensureDir("qtbase") # Ensures that qtbase exists and is a directory. Will create # it if it does not exist. #-------------------------------------------------------------------------------------------------- my $debugScript = 0; my %dep_to_sync_profile_map = ( - "QtCore" => "qtkernel/sync.profile", - "QtGui" => "qtkernel/sync.profile", - "QtXml" => "qtkernel/sync.profile", - "QtSql" => "qtkernel/sync.profile", - "QtTest" => "qtkernel/sync.profile", - "QtNetwork" => "qtkernel/sync.profile", - "QtDBus" => "qtkernel/sync.profile", - "QtOpenGL" => "qtkernel/sync.profile", - "QtOpenVG" => "qtkernel/sync.profile", - "QtUiTools" => "qtkernel/sync.profile", + "QtCore" => "qtbase/sync.profile", + "QtGui" => "qtbase/sync.profile", + "QtXml" => "qtbase/sync.profile", + "QtSql" => "qtbase/sync.profile", + "QtTest" => "qtbase/sync.profile", + "QtNetwork" => "qtbase/sync.profile", + "QtDBus" => "qtbase/sync.profile", + "QtOpenGL" => "qtbase/sync.profile", + "QtOpenVG" => "qtbase/sync.profile", + "QtUiTools" => "qtbase/sync.profile", "QtXmlPatterns" => "qtxmlpatterns/sync.profile", "phonon" => "phonon/sync.profile", "QtSvg" => "qtsvg/sync.profile", diff --git a/scripts/non-module-helpers b/scripts/non-module-helpers index dfacf3c..c4b0ed2 100644 --- a/scripts/non-module-helpers +++ b/scripts/non-module-helpers @@ -4,23 +4,23 @@ my %module2DirectoryMapping = ( declarative => "qtdeclarative", - opengl => "qtkernel", - openvg => "qtkernel", - dbus => "qtkernel", - sql => "qtkernel", + opengl => "qtbase", + openvg => "qtbase", + dbus => "qtbase", + sql => "qtbase", multimedia => "qtmultimedia", phonon => "phonon", - network => "qtkernel", + network => "qtbase", svg => "qtsvg", webkit => "qtwebkit", - xml => "qtkernel", + xml => "qtbase", xmlpatterns => "qtxmlpatterns", qt3support => "qt3support", script => "qtscript", scripttools => "qtscript", - core => "qtkernel", - gui => "qtkernel", - testlib => "qtkernel" + core => "qtbase", + gui => "qtbase", + testlib => "qtbase" ); # Takes a module name and returns its intended directory in modularized Qt. @@ -69,7 +69,7 @@ sub findDirectoryForApplication { } close($profileFd); - my $moduleDir = "qtkernel"; + my $moduleDir = "qtbase"; foreach $module (@modules) { next if (!$module); $module =~ s/[\n\r]//g; @@ -77,9 +77,9 @@ sub findDirectoryForApplication { if (!defined($maybeDir)) { die("No mapping for module in $dir: $module\n"); } - if ($maybeDir !~ "qtkernel") { - if ($maybeDir !~ $moduleDir && $moduleDir !~ "qtkernel") { - # This means we found more than one non-qtkernel module. + if ($maybeDir !~ "qtbase") { + if ($maybeDir !~ $moduleDir && $moduleDir !~ "qtbase") { + # This means we found more than one non-qtbase module. die ("Incompatible modules in $dir: " . join(" ", @modules) . ". Do this one manually."); } else { $moduleDir = $maybeDir; diff --git a/scripts/template b/scripts/template index 3a88b72..c5a8b86 100644 --- a/scripts/template +++ b/scripts/template @@ -13,7 +13,7 @@ # run("git mv foo bar") # runs command, reports error possition and dies # runNotDie("git mv foo bar") # runs command, reports error possition, returns error code # and continues. Use ($? >> 8) to get the real exit code. -# ensureDir("qtkernel") # Ensures that qtkernel exists and is a directory. Will create +# ensureDir("qtbase") # Ensures that qtbase exists and is a directory. Will create # it if it does not exist. #-------------------------------------------------------------------------------------------------- |